MP4: do not nul time scale

Some MP4-knowledgeable dev (fenrir?) really should check that this is
not too restrictive a check.

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index ee0659462efa5499e0dd5c23377e93a965d071f1..7efa0f2ec2e70def2a4d6fbaa56c27dbe8d4cd7c 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -472,6 +472,11 @@ static int Open( vlc_object_t * p_this )
     else
     {
         p_sys->i_timescale = p_mvhd->data.p_mvhd->i_timescale;
+        if( p_sys->i_timescale == 0 )
+        {
+            msg_Err( p_this, "bad timescale" );
+            goto error;
+        }
         p_sys->i_duration = p_mvhd->data.p_mvhd->i_duration;
     }
 
@@ -1995,6 +2000,8 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
     }
 
     p_track->i_timescale = p_mdhd->data.p_mdhd->i_timescale;
+    if( !p_track->i_timescale )
+        return;
 
     for( i = 0; i < 3; i++ )
     {