AVI: fix playback of files where movi chunk is outside of RIFF

This is notably the case with Nikon-Camera generated movies

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 219049b60aa3e64334ac71b40754935943a70f25..5490296c956a357ba28cf0bdeaf2d5692c25da91 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -329,6 +329,8 @@ static int Open( vlc_object_t * p_this )
     p_riff  = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_RIFF, 0 );
     p_hdrl  = AVI_ChunkFind( p_riff, AVIFOURCC_hdrl, 0 );
     p_movi  = AVI_ChunkFind( p_riff, AVIFOURCC_movi, 0 );
+    if( !p_movi )
+        p_movi  = AVI_ChunkFind( &p_sys->ck_root, AVIFOURCC_movi, 0 );
 
     if( !p_hdrl || !p_movi )
     {