From 8932d90ec6aeb3cc1f3640871798c40b3439d883 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 16 Mar 2015 11:58:11 +0100 Subject: demux_lavf: fix rejection of image2 demuxer This was probably broken for some time in git master, and the later commit which happened to fix it was not picked. Fixes #1689. --- demux/demux_lavf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index b6c020ef0b..208bd6087f 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -134,6 +134,7 @@ static const struct format_hack format_hacks[] = { BLACKLIST("bin"), // Image demuxers, disabled in favor of demux_mf (for now): BLACKLIST("image"), + BLACKLIST("image2"), BLACKLIST("image2pipe"), BLACKLIST("bmp_pipe"), BLACKLIST("dpx_pipe"), BLACKLIST("exr_pipe"), BLACKLIST("j2k_pipe"), BLACKLIST("png_pipe"), BLACKLIST("tiff_pipe"), -- cgit v1.2.3