[vlc-commits] AVI: fix playback of files where movi chunk is outside of RIFF

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 26 12:47:13 2012 +0200| [721e4cfc1c7a0d285865958af7955a710dcdd70d] | committer: Jean-Baptiste Kempf

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

This is notably the case with Nikon-Camera generated movies

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

 modules/demux/avi/avi.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 219049b..5490296 100644
--- 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 )
     {