virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vp3: Don't crop if there's a left/top offset, it's wrong

Browse Source 
Fixes issue1834

Originally committed as revision 22897 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-04-17 02:04:35 +00:00
parent eb6a6cd788
commit ddc7e438e0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vp3.c
View File

@ -1952,6 +1952,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
{ {
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int visible_width, visible_height, colorspace; int visible_width, visible_height, colorspace;
int offset_x = 0, offset_y = 0;
s->theora = get_bits_long(gb, 24); s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
@ -1977,8 +1978,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
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);
skip_bits(gb, 8); /* offset x */ offset_x = get_bits(gb, 8); /* offset x */
skip_bits(gb, 8); /* offset y */ offset_y = get_bits(gb, 8); /* offset y, from bottom */
} }
skip_bits(gb, 32); /* fps numerator */ skip_bits(gb, 32); /* fps numerator */
@ -2003,7 +2004,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
// align_get_bits(gb); // align_get_bits(gb);
if ( visible_width <= s->width && visible_width > s->width-16 if ( visible_width <= s->width && visible_width > s->width-16
&& visible_height <= s->height && visible_height > s->height-16) && visible_height <= s->height && visible_height > s->height-16
&& !offset_x && (offset_y == s->height - visible_height))
avcodec_set_dimensions(avctx, visible_width, visible_height); avcodec_set_dimensions(avctx, visible_width, visible_height);
else else
avcodec_set_dimensions(avctx, s->width, s->height); avcodec_set_dimensions(avctx, s->width, s->height);