videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539 

Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2010-09-08 20:18:14 +00:00
parent e47ca217cb
commit 9044dd8399
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mov.c
View File

@ -584,12 +584,13 @@ static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
if (den != 0) { if ((st->sample_aspect_ratio.den != 1 || st->sample_aspect_ratio.num) && // default
if ((st->sample_aspect_ratio.den != 1 || st->sample_aspect_ratio.num) && // default (den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num)) {
(den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num)) av_log(c->fc, AV_LOG_WARNING,
av_log(c->fc, AV_LOG_WARNING, "sample aspect ratio already set to %d:%d, ignoring 'pasp' atom (%d:%d)\n",
"sample aspect ratio already set to %d:%d, overriding by 'pasp' atom\n", st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); num, den);
} else if (den != 0) {
st->sample_aspect_ratio.num = num; st->sample_aspect_ratio.num = num;
st->sample_aspect_ratio.den = den; st->sample_aspect_ratio.den = den;
} }