diff options
| author | wm4 <wm4@nowhere> | 2015-10-08 19:56:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-10-08 19:59:49 +0200 |
| commit | 252d5b319a82ccea2062ece981287dad222b9b9b (patch) | |
| tree | 3662496e6ccab5fe3f993223eee5f4c62599be12 /demux | |
| parent | 280251656c4da593d45cc3676facccc7129a8189 (diff) | |
| download | mpv-252d5b319a82ccea2062ece981287dad222b9b9b.tar.bz2 mpv-252d5b319a82ccea2062ece981287dad222b9b9b.tar.xz | |
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.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_subreader.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |