summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-14 20:43:27 +0200
committerwm4 <wm4@nowhere>2014-10-14 20:43:27 +0200
commitffd3ae1fad2a63345a682635e8f2082e1d7475b7 (patch)
tree0a847dfc4945fab712140bc7f96d6b7727226b5b /demux
parent7c69848e3eb7ca2543233465333693285c54b1e6 (diff)
downloadmpv-ffd3ae1fad2a63345a682635e8f2082e1d7475b7.tar.bz2
mpv-ffd3ae1fad2a63345a682635e8f2082e1d7475b7.tar.xz
demux_lavf: let libavformat open HLS streams directly
Fixes opening some streams. This means the HLS playlist will be opened twice, but that's not much of a problem, considering it's pretty small, and HLS will make many other http accesses anyway.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index fd3a38ea89..ddec27f66d 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -707,7 +707,8 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
}
if ((priv->avif->flags & AVFMT_NOFILE) ||
- demuxer->stream->type == STREAMTYPE_AVDEVICE)
+ demuxer->stream->type == STREAMTYPE_AVDEVICE ||
+ matches_avinputformat_name(priv, "hls"))
{
// This might be incorrect.
demuxer->seekable = true;