[FFmpeg-cvslog] r15183 - trunk/libavcodec/mpeg12.c

[michael]

Author: michael
Date: Wed Sep  3 21:04:46 2008
New Revision: 15183

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


Modified:
   trunk/libavcodec/mpeg12.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	(original)
+++ trunk/libavcodec/mpeg12.c	Wed Sep  3 21:04:46 2008
@@ -1267,7 +1267,9 @@ static int mpeg_decode_postinit(AVCodecC
                 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],