[vlc-commits] Revert "demux: mp4: fix fallback on PAR"

Francois Cartegnie git at videolan.org
Wed Mar 26 19:16:34 CET 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Mar 26 19:14:23 2014 +0100| [5516edcab093004eeda6f1c3ff423b8c2771fd31] | committer: Francois Cartegnie

Revert "demux: mp4: fix fallback on PAR"

This reverts commit bcf7989613b3bb888e5a9941ffe3310539347586.

According to some other samples, doesn't sound like a correct fix.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5516edcab093004eeda6f1c3ff423b8c2771fd31
---

 modules/demux/mp4/mp4.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 9e2abd7..c3038f4 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1773,15 +1773,8 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
         if( p_pasp && p_pasp->data.p_pasp->i_horizontal_spacing > 0 &&
                       p_pasp->data.p_pasp->i_vertical_spacing > 0 )
         {
-            /* Convert pixel ratio to picture/display aspect ratio */
-            /* SAR * PAR -> DAR */
-            vlc_ureduce( &p_track->fmt.video.i_sar_num, &p_track->fmt.video.i_sar_den,
-                         (uint64_t) p_pasp->data.p_pasp->i_horizontal_spacing
-                                    * p_track->fmt.video.i_width,
-                         (uint64_t) p_pasp->data.p_pasp->i_vertical_spacing
-                                    * p_track->fmt.video.i_height,
-                         UINT32_MAX
-                         );
+            p_track->fmt.video.i_sar_num = p_pasp->data.p_pasp->i_horizontal_spacing;
+            p_track->fmt.video.i_sar_den = p_pasp->data.p_pasp->i_vertical_spacing;
         }
 
         /* Support for cropping (eg. in H263 files) */



More information about the vlc-commits mailing list