[FFmpeg-devel] [PATCH] avformat/tls: rename accidentally change options

[Marvin Scholz]

On 7 Jul 2025, at 23:43, Timo Rothenpieler wrote:

> On 07.07.2025 23:41, Marvin Scholz wrote:
>> This was accidentally renamed back to the old names in
>> ba9817df9df5911ceb2edff37d9ec970c29329e2
>> ---
>>   libavformat/tls.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/tls.h b/libavformat/tls.h
>> index 3644b64fe2..6b6d06ab2d 100644
>> --- a/libavformat/tls.h
>> +++ b/libavformat/tls.h
>> @@ -92,8 +92,8 @@ typedef struct TLSShared {
>>       {"http_proxy", "Set proxy to tunnel through",         offsetof(pstruct, options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
>>       {"use_external_udp", "Use external UDP from muxer or demuxer", offsetof(pstruct, options_field . use_external_udp), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, .flags = TLS_OPTFL }, \
>>       {"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT,  { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL}, \
>> -    {"cert_buf", "The optional certificate buffer for DTLS", offsetof(pstruct, options_field . cert_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \
>> -    {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \
>> +    {"cert_pem",   "Certificate PEM string",              offsetof(pstruct, options_field . cert_buf),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
>> +    {"key_pem",    "Private key PEM string",              offsetof(pstruct, options_field . key_buf),   AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
>>       FF_TLS_CLIENT_OPTIONS(pstruct, options_field)
>>    int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options);
>
> LGTM

Thanks, pushed as 0dedef15576d6e16d56b24c60bfd2cb06a7192a7

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".