aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2005-05-24 14:21:42 +0000
committerMike Melanson <mike@multimedia.cx>2005-05-24 14:21:42 +0000
commit9c7154c7ae3cbec9c6d9ca267c52832cd6fdd099 (patch)
treef94f64ac7d87027a479d2c4344d93c41428e6617
parentf39e56a84bd614238986e67fe47a62fa4de279d8 (diff)
downloadffmpeg-9c7154c7ae3cbec9c6d9ca267c52832cd6fdd099.tar.gz
read loop filter limit values from Theora header, courtesy of Matthieu
Castet (castet.matthieu -at- free.fr) Originally committed as revision 4304 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vp3.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 3dba5f4c44..757036d973 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -3420,9 +3420,9 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
if (s->theora >= 0x030200) {
n = get_bits(&gb, 3);
- /* loop filter table */
+ /* loop filter limit values table */
for (i = 0; i < 64; i++)
- skip_bits(&gb, n);
+ s->filter_limit_values[i] = get_bits(&gb, n);
}
if (s->theora >= 0x030200)
@@ -3497,10 +3497,6 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
}
}
- /* XXX FIXME: these limit values need to come from the Theora header */
- for (i = 0; i < 64; i++)
- s->filter_limit_values[i] = vp31_filter_limit_values[i];
-
s->theora_tables = 1;
return 0;