generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fixes issue562 and issue621.

Originally committed as revision 15183 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-09-03 19:04:46 +00:00
parent 1c9ff17920
commit 395206f6b1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg12.c
View File

@ -1267,7 +1267,9 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){
1<<30); 1<<30);
//MPEG-2 aspect //MPEG-2 aspect
if(s->aspect_ratio_info > 1){ 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= s->avctx->sample_aspect_ratio=
av_div_q( av_div_q(
ff_mpeg2_aspect[s->aspect_ratio_info], ff_mpeg2_aspect[s->aspect_ratio_info],