[MPlayer-cvslog] r37351 - trunk/libmpdemux/demux_avi.c

[reimar]

Author: reimar
Date: Tue Dec 30 16:34:41 2014
New Revision: 37351

Log:
demux_avi: Force libavformat if -novideo was used.

Changing our demuxer to support it is too much effort, so at least
make the fallback faster and less confusing.

Modified:
   trunk/libmpdemux/demux_avi.c

Modified: trunk/libmpdemux/demux_avi.c
==============================================================================
--- trunk/libmpdemux/demux_avi.c	Tue Dec 30 16:34:39 2014	(r37350)
+++ trunk/libmpdemux/demux_avi.c	Tue Dec 30 16:34:41 2014	(r37351)
@@ -865,6 +865,11 @@ static int avi_check_file(demuxer_t *dem
       /* Fallthrough */
     case formtypeAVI:
     case mmioFOURCC('A','V','I',0x19): // "Samsung Digimax i6 PMP" crap according to bug 742
+      if (demuxer->video->id == -2)
+      {
+          mp_msg(MSGT_DEMUXER, MSGL_INFO, "-novideo not supported by native AVI demuxer, selecting libavformat\n");
+          return DEMUXER_TYPE_LAVF;
+      }
       return DEMUXER_TYPE_AVI;
     }
   }