summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-11-14 13:46:03 +0100
committerwm4 <wm4@nowhere>2019-11-14 13:46:03 +0100
commit5a99015acf184a2989ea7ebf50ab2c990be41125 (patch)
tree08448e6073228a7c2eb3fe5790e1f6389d7ca329 /demux
parentac7f67b3f23a63e463fb881d960bc8f31a230292 (diff)
downloadmpv-5a99015acf184a2989ea7ebf50ab2c990be41125.tar.bz2
mpv-5a99015acf184a2989ea7ebf50ab2c990be41125.tar.xz
stream_lavf: set --network-timeout to 60 seconds by default
Until now, we've made FFmpeg use the default network timeout - which is apparently infinite. I don't know if this was changed at some point, although it seems likely, as I was sure there was a more useful default. For most use cases, a smaller timeout is more useful (for example recording something in the background), so force a timeout of 1 minute. See: #5793
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 9ac6495f15..5153bfe42f 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -925,7 +925,8 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
AVDictionary *dopts = NULL;
if ((priv->avif_flags & AVFMT_NOFILE) || priv->format_hack.no_stream) {
- mp_setup_av_network_options(&dopts, demuxer->global, demuxer->log);
+ mp_setup_av_network_options(&dopts, priv->avif->name,
+ demuxer->global, demuxer->log);
// This might be incorrect.
demuxer->seekable = true;
} else {