virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Theora 3.4 doesn't exist; these fields were misunderstandings of the spec

Browse Source 
Originally committed as revision 21775 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-02-12 22:01:18 +00:00
parent 45c3c92576
commit 337f5c6e30
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/vp3.c
View File

@ -2131,15 +2131,6 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
return -1; 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) { if (s->theora >= 0x030200) {
visible_width = get_bits_long(gb, 24); visible_width = get_bits_long(gb, 24);
visible_height = 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) if (s->theora < 0x030200)
skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 5); /* keyframe frequency force */
skip_bits(gb, 8); /* colorspace */ 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, 24); /* bitrate */
skip_bits(gb, 6); /* quality hint */ skip_bits(gb, 6); /* quality hint */
@ -2165,9 +2154,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
if (s->theora >= 0x030200) if (s->theora >= 0x030200)
{ {
skip_bits(gb, 5); /* keyframe frequency force */ skip_bits(gb, 5); /* keyframe frequency force */
skip_bits(gb, 2); /* pixel format: 420,res,422,444 */
if (s->theora < 0x030400) skip_bits(gb, 3); /* reserved */
skip_bits(gb, 5); /* spare bits */
} }
// align_get_bits(gb); // align_get_bits(gb);