From 252d5b319a82ccea2062ece981287dad222b9b9b Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 8 Oct 2015 19:56:50 +0200 Subject: demux_subreader: participate in probing only on Libav FFmpeg supports all formats the old subreader code does, and is better at it. On the other hand, subreader.c's probing is bad and can lead to false positives easily. --- demux/demux_subreader.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'demux') diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c index 87a5e9aeb8..b84f766b4a 100644 --- a/demux/demux_subreader.c +++ b/demux/demux_subreader.c @@ -758,6 +758,10 @@ static int d_open_file(struct demuxer *demuxer, enum demux_check check) { if (check > DEMUX_CHECK_REQUEST) return -1; +#if LIBAVUTIL_VERSION_MICRO >= 100 + if (check != DEMUX_CHECK_FORCE) + return -1; +#endif if (!demuxer->params || !demuxer->params->expect_subtitle) return -1; -- cgit v1.2.3