[SCM] libav/experimental: Fix Theora decoding bug if loopfilter is completely disabled Bug caused by the fact that get_bits(gb, 0) is undefined. Doesn't affect any streams generated by the official Theora encoder, but such streams are nevertheless valid.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1a48a57071df7756a92dee147acb2123cb92a799
Author: Jason Garrett-Glaser <darkshikari at gmail.com>
Date:   Tue Oct 26 07:29:00 2010 +0000

    Fix Theora decoding bug if loopfilter is completely disabled
    Bug caused by the fact that get_bits(gb, 0) is undefined.
    Doesn't affect any streams generated by the official Theora encoder, but such
    streams are nevertheless valid.
    
    Fixes decoding of CELT-933dd833-nmr-bandt.ogv.
    
    Originally committed as revision 25573 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 59719e7..85e45ea 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2052,6 +2052,7 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
     if (s->theora >= 0x030200) {
         n = get_bits(gb, 3);
         /* loop filter limit values table */
+        if (n) {
         for (i = 0; i < 64; i++) {
             s->filter_limit_values[i] = get_bits(gb, n);
             if (s->filter_limit_values[i] > 127) {
@@ -2059,6 +2060,7 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
                 s->filter_limit_values[i] = 127;
             }
         }
+        }
     }
 
     if (s->theora >= 0x030200)

-- 
Libav/FFmpeg packaging