diff options
| author | David Conrad <lessen42@gmail.com> | 2010-04-17 02:04:35 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-04-17 02:04:35 +0000 |
| commit | ddc7e438e009a7fbd44769ffce51a2764887b9ce (patch) | |
| tree | 150f2617ff7d0bb58acdc6294539a626d3590d66 /libavcodec/vp3.c | |
| parent | eb6a6cd788a172f146534c5fab9b98d6cbf59520 (diff) | |
vp3: Don't crop if there's a left/top offset, it's wrong
Fixes issue1834
Originally committed as revision 22897 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 2e72fba0fc..46307c1d1b 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1952,6 +1952,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) { Vp3DecodeContext *s = avctx->priv_data; int visible_width, visible_height, colorspace; + int offset_x = 0, offset_y = 0; s->theora = get_bits_long(gb, 24); 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_height = get_bits_long(gb, 24); - skip_bits(gb, 8); /* offset x */ - skip_bits(gb, 8); /* offset y */ + offset_x = get_bits(gb, 8); /* offset x */ + offset_y = get_bits(gb, 8); /* offset y, from bottom */ } skip_bits(gb, 32); /* fps numerator */ @@ -2003,7 +2004,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) // align_get_bits(gb); 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); else avcodec_set_dimensions(avctx, s->width, s->height); |