From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 2C79A4D8FA for ; Wed, 2 Jul 2025 16:58:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1F77668D404; Wed, 2 Jul 2025 19:57:24 +0300 (EEST) Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8BA7368D219 for ; Wed, 2 Jul 2025 19:57:11 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id EDD2A27FFCCB4; Wed, 02 Jul 2025 18:57:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1751475429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0aNB4VG3f0tqSFT914aihDd+tHBVdz0KnlC09OlXZUA=; b=oL0r70p1yekU+6lDVUS1UlDQTZzu6ZH43yz/8SqCqOWfeOLdd756hRiDTGthhNiNsKMxRJ 7BZL1IfiF8u5CBtRij5pFfNoHT27uXTFLh9dntM1TCxQxVyvI43ItljVU0rB0YMqhKAv/A 7wvXQldEUZ3qJ0ExFwEC5fD93A1z0Sn7ejqp0OUlo5OkpReQzZqxXvur4stRY0qKo1WOkv 732px7pMOMy6viDcUF98HrEX3D4+nZn+Jqe5wvaoVSVntWw26/3lUaLwvwSiUA+cVPasf7 j9/PjHRSqcfgX1HZCcSaE+d1iJwMGqFMFCGgz3UHHBdHFTmUQhqMHQuk6RfX+A== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Jul 2025 18:56:43 +0200 Message-ID: <20250702165655.1325-16-timo@rothenpieler.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250702165655.1325-1-timo@rothenpieler.org> References: <20250702165655.1325-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/18] avformat/tls: clean up new whip options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Timo Rothenpieler Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/tls.h | 6 +++--- libavformat/whip.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/tls.h b/libavformat/tls.h index 9285228657..83d6b1ab6e 100644 --- a/libavformat/tls.h +++ b/libavformat/tls.h @@ -84,13 +84,13 @@ typedef struct TLSShared { {"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 }, \ + {"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 }, \ {"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}, \ - {"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} + {"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL } int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options); diff --git a/libavformat/whip.c b/libavformat/whip.c index 602a4432bd..84d4c5a1f3 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -1291,12 +1291,12 @@ next_packet: if (whip->cert_file) { av_dict_set(&opts, "cert_file", whip->cert_file, 0); } else - av_dict_set(&opts, "cert_buf", whip->cert_buf, 0); + av_dict_set(&opts, "cert_pem", whip->cert_buf, 0); if (whip->key_file) { av_dict_set(&opts, "key_file", whip->key_file, 0); } else - av_dict_set(&opts, "key_buf", whip->key_buf, 0); + av_dict_set(&opts, "key_pem", whip->key_buf, 0); av_dict_set_int(&opts, "use_external_udp", 1, 0); av_dict_set_int(&opts, "listen", 1, 0); /* If got the first binding response, start DTLS handshake. */ -- 2.49.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".