[MPlayer-cvslog] r20324 - trunk/libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Fri Oct 20 21:31:52 2006
New Revision: 20324

Modified:
   trunk/libmpdemux/demuxer.c

Log:
Fix opening of demuxers without check_file function, broken by r20309.


Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Fri Oct 20 21:31:52 2006
@@ -662,9 +662,9 @@
 if (file_format) {
   if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) {
     demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename);
-    if (demuxer_desc->check_file) {
+    if (demuxer_desc->check_file)
       fformat = demuxer_desc->check_file(demuxer);
-      if (force)
+      if (force || !demuxer_desc->check_file)
         fformat = demuxer_desc->type;
       if (fformat != 0) {
         if (fformat == demuxer_desc->type) {
@@ -686,7 +686,6 @@
         // Check failed for forced demuxer, quit
         free_demuxer(demuxer);
         return NULL;
-    }
   }
 }