summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-17 21:47:56 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-17 21:47:56 +0200
commitdcaad783b049c311fe253ffa4f7ae405af4716c7 (patch)
tree982e50b7bea1792e0a339ddacea9f27fdc5b3f8c
parentb82f82fe0830e55c1c3393449fa0cc9160d82105 (diff)
downloadmpv-dcaad783b049c311fe253ffa4f7ae405af4716c7.tar.bz2
mpv-dcaad783b049c311fe253ffa4f7ae405af4716c7.tar.xz
demux_lavf: fix check for files lavf doesn't recognize
Commit 91ea30c585 ("demux_lavf: use lavf for all formats except those listed") broke handling of files whose type libavformat couldn't recognize at all. Fix the demux_lavf probe function to correctly return failure in that case.
-rw-r--r--libmpdemux/demux_lavf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index b2577d75a9..09999d80b5 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -248,8 +248,9 @@ static int lavf_check_preferred_file(demuxer_t *demuxer){
for (p = preferred_internal; *p; p++)
if (matches_avinputformat_name(priv, *p))
return 0;
+ return DEMUXER_TYPE_LAVF_PREFERRED;
}
- return DEMUXER_TYPE_LAVF_PREFERRED;
+ return 0;
}
static uint8_t char2int(char c) {