summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-05 16:44:50 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-07-05 19:03:28 +0200
commit958858f9204deb17494b4916be0029023c7d9036 (patch)
treeac88e1f9daec4e8870c8dcfe3e8982f17e4a62de
parentbd271ae1cc9360ec00ec2ddf2c8593010184aa0c (diff)
downloadmpv-958858f9204deb17494b4916be0029023c7d9036.tar.bz2
mpv-958858f9204deb17494b4916be0029023c7d9036.tar.xz
demux_lavf: for now, ignore the new libavformat image demuxers
Recently, libavformat added demuxers to open image files like normal demuxers. This is a good thing, but for now they interfere with the operation of demux_mf. Add them to the blacklist until there is a proper solution. (The list doesn't contain _all_ recognized image formats, just those that might interfere with demux_mf.) CC: @mpv-player/stable
-rw-r--r--demux/demux_lavf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 42cffd23a9..e922708626 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -129,6 +129,9 @@ static const struct format_hack format_hacks[] = {
static const char *const format_blacklist[] = {
"tty", // Useless non-sense, sometimes breaks MLP2 subreader.c fallback
+ // Image demuxers, disabled in favor of demux_mf:
+ "image2", "image2pipe",
+ "bmp_pipe", "dpx_pipe", "exr_pipe", "j2k_pipe", "png_pipe", "tiff_pipe",
0
};