summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormg <michel.gendre@softcom.pro>2020-02-27 16:22:20 +0100
committerwm4 <1387750+wm4@users.noreply.github.com>2020-03-03 18:31:20 +0100
commit24acddbdc4e18dd053ae873abc5764bea484d38d (patch)
tree43b034d5d4a7cf590b310863824ea32cfd3c8028
parente7bab0025f3617a2e19a1b9eacf689423787ed89 (diff)
downloadmpv-24acddbdc4e18dd053ae873abc5764bea484d38d.tar.bz2
mpv-24acddbdc4e18dd053ae873abc5764bea484d38d.tar.xz
demuxer-lavf: udp_multicast rtsp-transport option
-rw-r--r--DOCS/man/options.rst2
-rw-r--r--demux/demux_lavf.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 019f9b1426..af2bbf3f4f 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4629,7 +4629,7 @@ Network
option is ignored (or should be ignored) on RTSP URLs. You can still
set the timeout option directly with ``--demuxer-lavf-o``.
-``--rtsp-transport=<lavf|udp|tcp|http>``
+``--rtsp-transport=<lavf|udp|udp_multicast|tcp|http>``
Select RTSP transport method (default: tcp). This selects the underlying
network transport when playing ``rtsp://...`` URLs. The value ``lavf``
leaves the decision to libavformat.
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 0e48c3e900..212f954090 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -102,7 +102,9 @@ const struct m_sub_options demux_lavf_conf = {
({"lavf", 0},
{"udp", 1},
{"tcp", 2},
- {"http", 3})),
+ {"http", 3},
+ {"udp_multicast", 4}
+ )),
OPT_CHOICE("demuxer-lavf-linearize-timestamps", linearize_ts, 0,
({"no", 0}, {"auto", -1}, {"yes", 1})),
OPT_FLAG("demuxer-lavf-propagate-opts", propagate_opts, 0),
@@ -986,6 +988,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
case 1: transport = "udp"; break;
case 2: transport = "tcp"; break;
case 3: transport = "http"; break;
+ case 4: transport = "udp_multicast"; break;
}
if (transport)
av_dict_set(&dopts, "rtsp_transport", transport, 0);