From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Sep 2008 19:04:46 +0000 (+0000)
Subject: Ignore the spec, and calculate aspect ratio on width/height.
X-Git-Tag: v0.5~2712
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=395206f6b1e445258cba1bdffb82060939030bb4;p=platform%2Fupstream%2Flibav.git

Ignore the spec, and calculate aspect ratio on width/height.
Fixes issue562 and issue621.

Originally committed as revision 15183 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index a7272d5..966fa48 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1267,7 +1267,9 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
                 1<<30);
         //MPEG-2 aspect
             if(s->aspect_ratio_info > 1){
-                if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) ){
+                //we ignore the spec here as reality does not match the spec, see for example
+                // res_change_ffmpeg_aspect.ts and sequence-display-aspect.mpg
+                if( (s1->pan_scan.width == 0 )||(s1->pan_scan.height == 0) || 1){
                     s->avctx->sample_aspect_ratio=
                         av_div_q(
                          ff_mpeg2_aspect[s->aspect_ratio_info],