[SCM] libav/experimental: Use enum FrameType as parameter to construct_perm_table().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:54:13 UTC 2013


The following commit has been merged in the experimental branch:
commit adadf26bb9a84b6f45ce30ea47374d9a9afffc80
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Sun Nov 8 23:37:59 2009 +0000

    Use enum FrameType as parameter to construct_perm_table().
    
    Originally committed as revision 20480 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index 57c3301..814a0b0 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -1014,6 +1014,7 @@ static av_cold void init_bitstream_params(TwinContext *tctx)
     int bsize_no_main_cb[3];
     int bse_bits[3];
     int i;
+    enum FrameType frametype;
 
     for (i = 0; i < 3; i++)
         // +1 for history usage switch
@@ -1062,8 +1063,8 @@ static av_cold void init_bitstream_params(TwinContext *tctx)
         tctx->length_change[i] = num_rounded_up;
     }
 
-    for (i = 0; i < 4; i++)
-        construct_perm_table(tctx, i);
+    for (frametype = FT_SHORT; frametype <= FT_PPC; frametype++)
+        construct_perm_table(tctx, frametype);
 }
 
 static av_cold int twin_decode_init(AVCodecContext *avctx)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list