X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Findeo2.c;h=6755014110bf72663adf50a1b81149f2aa99d77c;hb=5b423887f4dcf2b200689e472b9e239a1cf86a6b;hp=a107574a26dc1dd922c35cf9f9242a210dca5d96;hpb=9106a698e726c041128a05db0a011caae755d10b;p=ffmpeg

diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index a107574a26d..6755014110b 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "indeo2data.h"
+#include "libavutil/common.h"
 
 typedef struct Ir2Context{
     AVCodecContext *avctx;
@@ -160,7 +161,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
     /* decide whether frame uses deltas or not */
 #ifndef ALT_BITSTREAM_READER_LE
     for (i = 0; i < buf_size; i++)
-        buf[i] = ff_reverse[buf[i]];
+        buf[i] = av_reverse[buf[i]];
 #endif
     start = 48; /* hardcoded for now */
 
@@ -192,25 +193,37 @@ 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;
 }
 
+static av_cold int ir2_decode_end(AVCodecContext *avctx){
+    Ir2Context * const ic = avctx->priv_data;
+    AVFrame *pic = &ic->picture;
+
+    if (pic->data[0])
+        avctx->release_buffer(avctx, pic);
+
+    return 0;
+}
+
 AVCodec indeo2_decoder = {
     "indeo2",
     CODEC_TYPE_VIDEO,
@@ -218,7 +231,7 @@ AVCodec indeo2_decoder = {
     sizeof(Ir2Context),
     ir2_decode_init,
     NULL,
-    NULL,
+    ir2_decode_end,
     ir2_decode_frame,
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),