From 16af29a7a6deff3f6081fca1e36ad96cf8fec77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Tue, 27 Nov 2012 21:55:28 +0100
Subject: [PATCH] vc1dec: add hacks to ensure static tables are initialized in
open().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
---
libavcodec/vc1dec.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b6d59c9948a..f5c532985c2 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5180,6 +5180,15 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
if (ff_vc1_init_common(v) < 0)
return -1;
+ // ensure static VLC tables are initialized
+ if (ff_msmpeg4_decode_init(avctx) < 0)
+ return -1;
+ if (ff_vc1_decode_init_alloc_tables(v) < 0)
+ return -1;
+ // Hack to ensure the above functions will be called
+ // again once we know all necessary settings.
+ // That this is necessary might indicate a bug.
+ ff_vc1_decode_end(avctx);
ff_vc1dsp_init(&v->vc1dsp);
if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) {
--
GitLab