diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 21:06:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 21:06:57 +0000 |
| commit | f53ee31275f4b9c544708e2eadda4dc5c22d217d (patch) | |
| tree | a857c93954369fc6137b1723120badcb2df0a7cf /libavformat | |
| parent | 5823e4b8f6a92011938e96cd8753959aecc3d139 (diff) | |
| download | ffmpeg-f53ee31275f4b9c544708e2eadda4dc5c22d217d.tar.gz | |
change sample aspect ratio test to be more clear, print old one
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 25f96e79d8..fc946ea33a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -439,10 +439,11 @@ static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom) const int den = get_be32(pb); AVStream * const st = c->fc->streams[c->fc->nb_streams-1]; if (den != 0) { - if ((st->sample_aspect_ratio.den && den != st->sample_aspect_ratio.den) || - (st->sample_aspect_ratio.num && num != st->sample_aspect_ratio.num)) + 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, overriding by 'pasp' atom\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 = num; st->sample_aspect_ratio.den = den; } |