# HG changeset patch
# User bcoudurier
# Date 1278026307 0
# Node ID 6f6ecca6904a13c63b4e3e78c1f953d81f4e6f8b
# Parent  da46dcc05d4af45867873b8426b433ddbd4a4654
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
rectalogic at rectalogic dot com
Fixes issue #1754

diff -r da46dcc05d4a -r 6f6ecca6904a mov.c
--- 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,