Mercurial > mplayer.hg

changeset 20318:d8d2bc754413

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix opening of demuxers without check_file function, broken by r20309.
author reimar
date Fri, 20 Oct 2006 19:31:52 +0000
parents 50584bb892c0
children 03e64a7a6d5e
files libmpdemux/demuxer.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.c	Fri Oct 20 19:19:29 2006 +0000
+++ b/libmpdemux/demuxer.c	Fri Oct 20 19:31:52 2006 +0000
@@ -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;
-    }
   }
 }