# HG changeset patch # User reimar # Date 1161372712 0 # Node ID d8d2bc7544130f2058c7bc69e73e3be7f7dbfc9e # Parent 50584bb892c039eb58a7f05f2a9a6fa280d503f0 Fix opening of demuxers without check_file function, broken by r20309. diff -r 50584bb892c0 -r d8d2bc754413 libmpdemux/demuxer.c --- 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; - } } }