diff options
| author | David Conrad <lessen42@gmail.com> | 2010-02-12 22:01:18 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-02-12 22:01:18 +0000 |
| commit | 337f5c6e3010929e6560e071cefa6299b8b31d6d (patch) | |
| tree | b95d6ad282a7e885aa1513dae99b16c75d1e1b92 /libavcodec/vp3.c | |
| parent | 45c3c92576d9cb6a39b0bb68fc8d0da06be4ccc5 (diff) | |
Theora 3.4 doesn't exist; these fields were misunderstandings of the spec
Originally committed as revision 21775 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 5958c2db4a..42c306196e 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2131,15 +2131,6 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) return -1; } - if (s->theora >= 0x030400) - { - skip_bits(gb, 32); /* total number of superblocks in a frame */ - // fixme, the next field is 36bits long - skip_bits(gb, 32); /* total number of blocks in a frame */ - skip_bits(gb, 4); /* total number of blocks in a frame */ - skip_bits(gb, 32); /* total number of macroblocks in a frame */ - } - if (s->theora >= 0x030200) { visible_width = get_bits_long(gb, 24); visible_height = get_bits_long(gb, 24); @@ -2156,8 +2147,6 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) if (s->theora < 0x030200) skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 8); /* colorspace */ - if (s->theora >= 0x030400) - skip_bits(gb, 2); /* pixel format: 420,res,422,444 */ skip_bits(gb, 24); /* bitrate */ skip_bits(gb, 6); /* quality hint */ @@ -2165,9 +2154,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) if (s->theora >= 0x030200) { skip_bits(gb, 5); /* keyframe frequency force */ - - if (s->theora < 0x030400) - skip_bits(gb, 5); /* spare bits */ + skip_bits(gb, 2); /* pixel format: 420,res,422,444 */ + skip_bits(gb, 3); /* reserved */ } // align_get_bits(gb); |