[vlc-devel] [PATCH 1/9] MP4 demux: only set fragmented flag if file contains movie fragment atoms.

[Matthias Keiser]

---
 modules/demux/mp4/mp4.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 4c6b680..361e568 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -361,7 +361,8 @@ static int Open( vlc_object_t * p_this )
     if( LoadInitFrag( p_demux, b_smooth ) != VLC_SUCCESS )
         goto error;
 
-    if( MP4_BoxCount( p_sys->p_root, "/moov/mvex" ) > 0 )
+    if( MP4_BoxCount( p_sys->p_root, "/moov/mvex" ) > 0 &&
+        MP4_BoxCount( p_sys->p_root, "/moof" ) > 0 )
     {
         p_sys->b_fragmented = true;
     }
@@ -378,6 +379,9 @@ static int Open( vlc_object_t * p_this )
         CreateTracksFromSmooBox( p_demux );
         return VLC_SUCCESS;
     }
+    //FIXME: relying on STREAM_CAN_FASTSEEK to decide if we can parse
+    // a file is a bad heuristic, because local files are always
+    // fast-seekable.
     else if( p_sys->b_fragmented && b_seekable )
     {
         /* We are not yet able to demux a fragmented MP4 file, using the 'mfra'
-- 
1.8.3.4 (Apple Git-47)