Mercurial > libavcodec.hg
changeset 11127:2f7baf2042a3 libavcodec
Theora 3.4 doesn't exist; these fields were misunderstandings of the spec
| author | conrad |
|---|---|
| date | Fri, 12 Feb 2010 22:01:18 +0000 |
| parents | df07e602819f |
| children | b6a0e8a27941 |
| files | vp3.c |
| diffstat | 1 files changed, 2 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/vp3.c Fri Feb 12 22:00:29 2010 +0000 +++ b/vp3.c Fri Feb 12 22:01:18 2010 +0000 @@ -2131,15 +2131,6 @@ 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 @@ 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 @@ 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);