From: XV <?@?>
Signed-off-by: Anton Khirnov <[email protected]>
---
libavcodec/intelh263dec.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index be6ce59..4ef00e3 100644
--- a/libavcodec/intelh263dec.c
+++ b/libavcodec/intelh263dec.c
@@ -67,6 +67,7 @@ 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);
@@ -92,9 +93,14 @@ 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);
--
1.7.5.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
