summaryrefslogtreecommitdiff
path: root/libavcodec/intelh263dec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-06-09 22:36:31 +0200
committerAnton Khirnov <anton@khirnov.net>2011-06-09 22:53:17 +0200
commit8e84c072e4e8db33641696555ed73de61ce61442 (patch)
treedd81baf87017fe4db90606e8436033f712a9c859 /libavcodec/intelh263dec.c
parent95a05030ca73076a8e5127e69596ade5964af60b (diff)
downloadffmpeg-8e84c072e4e8db33641696555ed73de61ce61442.tar.gz
intelh263dec: aspect ratio processing fix.
patch submitted by xvid_fan freenet de
Diffstat (limited to 'libavcodec/intelh263dec.c')
-rw-r--r--libavcodec/intelh263dec.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index b60608cd31..83049bcc6f 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -67,6 +67,8 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
if (format < 6) {
s->width = h263_format[format][0];
s->height = h263_format[format][1];
+ s->avctx->sample_aspect_ratio.num = 12;
+ s->avctx->sample_aspect_ratio.den = 11;
} else {
format = get_bits(&s->gb, 3);
if(format == 0 || format == 7){
@@ -91,9 +93,13 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s)
skip_bits1(&s->gb);
skip_bits(&s->gb, 9); // display height
if(ar == 15){
- skip_bits(&s->gb, 8); // aspect ratio - width
- skip_bits(&s->gb, 8); // aspect ratio - height
+ s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width
+ s->avctx->sample_aspect_ratio.den = get_bits(&s->gb, 8); // aspect ratio - height
+ } else {
+ s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[ar];
}
+ if (s->avctx->sample_aspect_ratio.num == 0)
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid aspect ratio.\n");
}
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);