From 1a48a57071df7756a92dee147acb2123cb92a799 Mon Sep 17 00:00:00 2001 From: Jason Garrett-Glaser Date: Tue, 26 Oct 2010 07:29:00 +0000 Subject: [PATCH] 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 --- libavcodec/vp3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 59719e7e65..85e45eafe8 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)