diff options
| author | Zhao Zhili <quinkblack@foxmail.com> | 2021-06-04 15:01:34 +0800 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2021-06-09 00:09:33 +0200 |
| commit | 58614f7beee87709dabb9ecc9a709e76f68e49cc (patch) | |
| tree | bf0cd1f1058dac90b220aba0d9fe019c8574401f | |
| parent | 55c54ff74455c70aee243c944c124a04ecdb2d9d (diff) | |
avformat/libsrt: workaround conflict with ffmpeg cmdline option
Add 'srt_streamid' option as an alias for 'streamid'.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | doc/protocols.texi | 3 | ||||
| -rw-r--r-- | libavformat/libsrt.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 94487e52ff..d3095c88c6 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 3a57ac53cb..8dee6aa3f3 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -135,6 +135,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" }, diff --git a/libavformat/version.h b/libavformat/version.h index 5de0814316..ecea39d59c 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MINOR 2 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |