MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Visible width/height fields were added in Theora 3.2

Browse Source 
Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2008-10-01 14:43:08 +00:00
parent 51ace5777e
commit 277e3e534b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vp3.c
View File

@ -2078,8 +2078,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
}
s->width = get_bits(gb, 16) << 4;
s->height = get_bits(gb, 16) << 4;
visible_width = s->width = get_bits(gb, 16) << 4;
visible_height = s->height = get_bits(gb, 16) << 4;
if(avcodec_check_dimensions(avctx, s->width, s->height)){
av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
@ -2096,10 +2096,10 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
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);
if (s->theora >= 0x030200) {
skip_bits(gb, 8); /* offset x */
skip_bits(gb, 8); /* offset y */
}

3
libavformat/oggparsetheora.c
View File

@ -75,14 +75,15 @@ theora_header (AVFormatContext * s, int idx)
if (version >= 0x030400)
skip_bits(&gb, 100);
if (version >= 0x030200) {
width = get_bits_long(&gb, 24);
height = get_bits_long(&gb, 24);
if ( width <= st->codec->width && width > st->codec->width-16
&& height <= st->codec->height && height > st->codec->height-16)
avcodec_set_dimensions(st->codec, width, height);
if (version >= 0x030200)
skip_bits(&gb, 16);
}
st->codec->time_base.den = get_bits_long(&gb, 32);
st->codec->time_base.num = get_bits_long(&gb, 32);
st->time_base = st->codec->time_base;