Mercurial > libavformat.hg

changeset 6466:35bb7cdfe337 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
author bcoudurier
date Wed, 08 Sep 2010 20:18:14 +0000
parents e0d8a52ce091
children bae1afdd961a
files mov.c
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Tue Sep 07 21:06:21 2010 +0000
+++ b/mov.c	Wed Sep 08 20:18:14 2010 +0000
@@ -584,12 +584,13 @@
         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;
     }