RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2006-10-20 19:31:52 +00:00
parent 11a8049263
commit d42038edb9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmpdemux/demuxer.c
View File

@ -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) {
@ -687,7 +687,6 @@ if (file_format) {
free_demuxer(demuxer);
return NULL;
}
}
}
// Test demuxers with safe file checks