From 18e6d07612030d6163bf5ca08c7e4ed472bcfc5b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 5 Jul 2014 16:44:50 +0200 Subject: 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 --- demux/demux_lavf.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'demux/demux_lavf.c') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 4b887a9656..47e4367fc7 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 }; -- cgit v1.2.3