[SCM] libav/experimental: Get rid of INIT_VLC_USE_STATIC in 4xm.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:43:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 2a0241ae12c7187a42dd039dc438844a63589634
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Apr 11 13:43:09 2009 +0000

    Get rid of INIT_VLC_USE_STATIC in 4xm.
    
    Originally committed as revision 18435 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index a9ad1e9..3348ed0 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -237,12 +237,15 @@ static void idct(DCTELEM block[64]){
 }
 
 static av_cold void init_vlcs(FourXContext *f){
+    static VLC_TYPE table[8][32][2];
     int i;
 
     for(i=0; i<8; i++){
+        block_type_vlc[0][i].table= table[i];
+        block_type_vlc[0][i].table_allocated= 32;
         init_vlc(&block_type_vlc[0][i], BLOCK_TYPE_VLC_BITS, 7,
                  &block_type_tab[0][i][0][1], 2, 1,
-                 &block_type_tab[0][i][0][0], 2, 1, INIT_VLC_USE_STATIC);
+                 &block_type_tab[0][i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC);
     }
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list