Commit 9044dd83 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

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
parent e47ca217
......@@ -584,12 +584,13 @@ static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
return 0;
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
(den != st->sample_aspect_ratio.den || num != st->sample_aspect_ratio.num))
av_log(c->fc, AV_LOG_WARNING,
"sample aspect ratio already set to %d:%d, overriding by 'pasp' atom\n",
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
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)) {
av_log(c->fc, AV_LOG_WARNING,
"sample aspect ratio already set to %d:%d, ignoring 'pasp' atom (%d:%d)\n",
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.den = den;
}
......
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