On Fri, 4 Jun 2021, Zhao Zhili wrote:
Add 'srt_streamid' option as an alias for 'streamid'.
---
doc/protocols.texi | 3 +++
libavformat/libsrt.c | 1 +
2 files changed, 4 insertions(+)
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 8371f83059..8b21ce046e 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1558,6 +1558,9 @@ This option doesn’t make sense in Rendezvous connection;
the result
might be that simply one side will override the value from the other
side and it’s the matter of luck which one would win
+@item srt_streamid=@var{string}
+Alias for @samp{streamid} to avoid conflict with ffmpeg command line option.
+
@item smoother=@var{live|file}
The type of Smoother used for the transmission for that socket, which
is responsible for the transmission and congestion control. The Smoother
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index 6ea6c35c53..afbf01fc87 100644
--- a/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@ -134,6 +134,7 @@ static const AVOption libsrt_options[] = {
{ "lossmaxttl", "Maximum possible packet reorder tolerance",
OFFSET(lossmaxttl), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX,
.flags = D|E },
{ "minversion", "The minimum SRT version that is required from the
peer", OFFSET(minversion), AV_OPT_TYPE_INT, { .i64 = -1 }, -1,
INT_MAX, .flags = D|E },
{ "streamid", "A string of up to 512 characters that an Initiator can pass
to a Responder", OFFSET(streamid), AV_OPT_TYPE_STRING, { .str = NULL },
.flags = D|E },
+ { "srt_streamid", "A string of up to 512 characters that an Initiator can
pass to a Responder", OFFSET(streamid), AV_OPT_TYPE_STRING, { .str = NULL },
.flags = D|E },
{ "smoother", "The type of Smoother used for the transmission for that
socket", OFFSET(smoother), AV_OPT_TYPE_STRING, { .str = NULL },
.flags = D|E },
{ "messageapi", "Enable message API",
OFFSET(messageapi), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1,
.flags = D|E },
{ "transtype", "The transmission type for the socket",
OFFSET(transtype), AV_OPT_TYPE_INT, { .i64 = SRTT_INVALID }, SRTT_LIVE, SRTT_INVALID,
.flags = D|E, "transtype" },
--
2.31.1
Thanks, applied.
Regards,
Marton
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
