[FFmpeg-cvslog] r25080 - trunk/libavformat/mov.c
bcoudurier
subversion
Wed Sep 8 22:18:14 CEST 2010
Author: bcoudurier
Date: Wed Sep 8 22:18:14 2010
New Revision: 25080
Log:
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
Modified:
trunk/libavformat/mov.c
Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c Wed Sep 8 18:02:20 2010 (r25079)
+++ trunk/libavformat/mov.c Wed Sep 8 22:18:14 2010 (r25080)
@@ -584,12 +584,13 @@ static int mov_read_pasp(MOVContext *c,
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;
}
More information about the ffmpeg-cvslog
mailing list