On 24 Jun 2025, at 21:23, Marvin Scholz wrote:
> Used in a future commit to not duplicate options.
> ---
> libavformat/tls.h | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/tls.h b/libavformat/tls.h
> index 2f381acc04..c1d2e21508 100644
> --- a/libavformat/tls.h
> +++ b/libavformat/tls.h
> @@ -80,20 +80,24 @@ typedef struct TLSShared {
> } TLSShared;
>
> #define TLS_OPTFL (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
> -#define TLS_COMMON_OPTIONS(pstruct, options_field) \
> +
> +#define FF_TLS_CLIENT_OPTIONS(pstruct, options_field) \
> {"ca_file", "Certificate Authority database file", offsetof(pstruct,
> options_field . ca_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
> {"cafile", "Certificate Authority database file", offsetof(pstruct,
> options_field . ca_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
> {"tls_verify", "Verify the peer certificate", offsetof(pstruct,
> options_field . verify), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags =
> TLS_OPTFL }, \
> {"cert_file", "Certificate file", offsetof(pstruct,
> options_field . cert_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
> {"key_file", "Private key file", offsetof(pstruct,
> options_field . key_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
> + {"verifyhost", "Verify against a specific hostname", offsetof(pstruct,
> options_field . host), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }
> +
> +#define TLS_COMMON_OPTIONS(pstruct, options_field) \
> {"listen", "Listen for incoming connections", offsetof(pstruct,
> options_field . listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags =
> TLS_OPTFL }, \
> - {"verifyhost", "Verify against a specific hostname", offsetof(pstruct,
> options_field . host), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
> {"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}, \
> {"fingerprint", "The optional fingerprint for DTLS", offsetof(pstruct,
> options_field . fingerprint), AV_OPT_TYPE_STRING, .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}
> + {"key_buf", "The optional private key buffer for DTLS",
> 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);
>
> --
> 2.39.5 (Apple Git-154)
If there are no objections, I plan to push this patchset this weekend.
_______________________________________________
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".
