[MPlayer-cvslog] r36437 - trunk/libmpdemux/aviheader.c

[reimar]

Author: reimar
Date: Sat Aug 31 08:49:56 2013
New Revision: 36437

Log:
avidemux: try reading ODML index if the default one is
uselessly small.

Fixes Bugzilla #2150.

Modified:
   trunk/libmpdemux/aviheader.c

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Fri Aug 30 21:41:38 2013	(r36436)
+++ trunk/libmpdemux/aviheader.c	Sat Aug 31 08:49:56 2013	(r36437)
@@ -461,7 +461,11 @@ while(1){
 
 }
 
-if (priv->suidx_size > 0 && priv->idx_size == 0) {
+// Some files contain a dummy non-odml index.
+// Ignore an index smaller than some arbitrary size.
+// Some Canon cameras recording in MJPEG do this
+// (encoder software identifier CanonMVI06).
+if (priv->suidx_size > 0 && priv->idx_size < 4) {
     /*
      * No NEWAVIINDEX, but we got an OpenDML index.
      */