diff options
| author | wm4 <wm4@nowhere> | 2015-03-16 11:58:11 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-16 11:58:24 +0100 |
| commit | 8932d90ec6aeb3cc1f3640871798c40b3439d883 (patch) | |
| tree | 63c8a561cf11228e4ed330ab62def8058e565365 | |
| parent | fc4da23c64397c9a90e656a00886997590db9380 (diff) | |
| download | mpv-8932d90ec6aeb3cc1f3640871798c40b3439d883.tar.bz2 mpv-8932d90ec6aeb3cc1f3640871798c40b3439d883.tar.xz | |
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.
| -rw-r--r-- | demux/demux_lavf.c | 1 |
1 files changed, 1 insertions, 0 deletions
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"), |