From: Gildas Bazin <gbazin@videolan.org>
Date: Fri, 12 Mar 2004 11:13:57 +0000 (+0000)
Subject: * modules/demux/mp4/mp4.c: work-around buggy muxers which don't set properly the... 
X-Git-Tag: 0.7.2~693
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c298771c44d2d3aed2b23e2595a4bb92843592f;p=vlc

* modules/demux/mp4/mp4.c: work-around buggy muxers which don't set properly the display size in the mov/mp4 container.
---

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index e791711c3a..523d0301df 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1146,7 +1146,9 @@ static int  TrackCreateES   ( input_thread_t   *p_input,
             p_track->fmt.video.i_height = p_track->i_height;
 
         /* Find out apect ratio from display size */
-        if( p_track->i_width > 0 && p_track->i_height > 0 )
+        if( p_track->i_width > 0 && p_track->i_height > 0 &&
+            /* Work-around buggy muxed files */
+            p_sample->data.p_sample_vide->i_width != p_track->i_width )
             p_track->fmt.video.i_aspect =
                 VOUT_ASPECT_FACTOR * p_track->i_width / p_track->i_height;