summaryrefslogtreecommitdiff
path: root/libavcodec/indeo2.c
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2009-04-17 14:09:56 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-04-17 14:09:56 +0000
commitbd4110f99b6c4ce3a7fc134206404489dc8e41a6 (patch)
tree95f65ac0ae35b2dd652f1e6c3608a855b369b84c /libavcodec/indeo2.c
parent1d0036b01f1860fdead35a6efcdc1d0beb4c3269 (diff)
Use new static VLC scheme in Indeo2, Musepack and WNV1 decoders
Originally committed as revision 18553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/indeo2.c')
-rw-r--r--libavcodec/indeo2.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index a107574a26..53624a1078 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -192,20 +192,22 @@ static int ir2_decode_frame(AVCodecContext *avctx,
static av_cold int ir2_decode_init(AVCodecContext *avctx){
Ir2Context * const ic = avctx->priv_data;
+ static VLC_TYPE vlc_tables[1 << CODE_VLC_BITS][2];
ic->avctx = avctx;
avctx->pix_fmt= PIX_FMT_YUV410P;
- if (!ir2_vlc.table)
+ ir2_vlc.table = vlc_tables;
+ ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
#ifdef ALT_BITSTREAM_READER_LE
init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_codes[0][1], 4, 2,
- &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC | INIT_VLC_LE);
+ &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
#else
init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_codes[0][1], 4, 2,
- &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC);
+ &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
#endif
return 0;