Commit 395206f6 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 1c9ff179
......@@ -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],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment