diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-20 19:31:52 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-20 19:31:52 +0000 |
| commit | d42038edb96aac534b9b411304860422810cdc07 (patch) | |
| tree | 231b0f27f8f60fc6f23d2d7cdc110fe1b0bb2a97 /libmpdemux/demuxer.c | |
| parent | 11a8049263ba6e29fb004f99f60ce11e8ff74d27 (diff) | |
| download | mpv-d42038edb96aac534b9b411304860422810cdc07.tar.bz2 mpv-d42038edb96aac534b9b411304860422810cdc07.tar.xz | |
Fix opening of demuxers without check_file function, broken by r20309.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index b0df738633..76f08384a1 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -662,9 +662,9 @@ int i; 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 @@ if (file_format) { // Check failed for forced demuxer, quit free_demuxer(demuxer); return NULL; - } } } |