[FFmpeg-cvslog] intelh263dec: aspect ratio processing fix.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jun  9 22:36:31 2011 +0200| [8e84c072e4e8db33641696555ed73de61ce61442] | committer: Anton Khirnov

intelh263dec: aspect ratio processing fix.

patch submitted by xvid_fan freenet de

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e84c072e4e8db33641696555ed73de61ce61442
---

 libavcodec/intelh263dec.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c
index b60608c..83049bc 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);