[SCM] libav/experimental: get_vlc2()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:33:47 UTC 2013


The following commit has been merged in the experimental branch:
commit 1c0a593ac871784baea4b6de368db6d5d86ba8b9
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Oct 27 21:02:47 2002 +0000

    get_vlc2()
    
    Originally committed as revision 1084 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 2360d7f..10402c3 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -831,9 +831,8 @@ static int mjpeg_decode_sof0(MJpegDecodeContext *s)
 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index)
 {
     int code, diff;
-#if 0
-    code = get_vlc2(&s->gb, s->vlc[0][dc_index].table,
-	s->vlc[0][dc_index].bits, 1);
+#if 1
+    code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2);
 #else
     code = get_vlc(&s->gb, &s->vlcs[0][dc_index]);
 #endif
@@ -876,9 +875,8 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
     ac_vlc = &s->vlcs[1][ac_index];
     i = 1;
     for(;;) {
-#if 0
-	code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table,
-	    s->vlcs[1][ac_index].bits, 2);
+#if 1
+	code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2);
 #else
         code = get_vlc(&s->gb, ac_vlc);
 #endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list