Mercurial > libavformat.hg

changeset 6211:6f6ecca6904a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In mov demuxer, only set sar if not already set, patch by Andrew Wason, rectalogic at rectalogic dot com Fixes issue #1754
author bcoudurier
date Thu, 01 Jul 2010 23:18:27 +0000
parents da46dcc05d4a
children 0c4d80e5428f
files mov.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Thu Jul 01 22:31:31 2010 +0000
+++ b/mov.c	Thu Jul 01 23:18:27 2010 +0000
@@ -1802,13 +1802,10 @@
         sc->pb = c->fc->pb;
 
     if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-        if (st->codec->width != sc->width || st->codec->height != sc->height) {
-            AVRational r = av_d2q(((double)st->codec->height * sc->width) /
-                                  ((double)st->codec->width * sc->height), INT_MAX);
-            if (st->sample_aspect_ratio.num)
-                st->sample_aspect_ratio = av_mul_q(st->sample_aspect_ratio, r);
-            else
-                st->sample_aspect_ratio = r;
+        if (!st->sample_aspect_ratio.num &&
+            (st->codec->width != sc->width || st->codec->height != sc->height)) {
+            st->sample_aspect_ratio = av_d2q(((double)st->codec->height * sc->width) /
+                                             ((double)st->codec->width * sc->height), INT_MAX);
         }
 
         av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,