Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marvin Scholz <epirat07-at-gmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 3/8] avformat/tls_openssl: remove now unnecessary define
Date: Wed, 25 Jun 2025 21:59:11 +0200
Message-ID: <20250625195916.20276-3-epirat07@gmail.com> (raw)
In-Reply-To: <20250625195916.20276-1-epirat07@gmail.com>

This was used previously when multiple OpenSSL versions were supported
that required this to be handled differently.
---
 libavformat/tls_openssl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c
index 525b7f3701..25991c8c9d 100644
--- a/libavformat/tls_openssl.c
+++ b/libavformat/tls_openssl.c
@@ -567,11 +567,9 @@ static int url_bio_destroy(BIO *b)
     return 1;
 }
 
-#define GET_BIO_DATA(x) BIO_get_data(x)
-
 static int url_bio_bread(BIO *b, char *buf, int len)
 {
-    TLSContext *c = GET_BIO_DATA(b);
+    TLSContext *c = BIO_get_data(b);
     int ret = ffurl_read(c->tls_shared.is_dtls ? c->tls_shared.udp : c->tls_shared.tcp, buf, len);
     if (ret >= 0)
         return ret;
@@ -587,7 +585,7 @@ static int url_bio_bread(BIO *b, char *buf, int len)
 
 static int url_bio_bwrite(BIO *b, const char *buf, int len)
 {
-    TLSContext *c = GET_BIO_DATA(b);
+    TLSContext *c = BIO_get_data(b);
     int ret = ffurl_write(c->tls_shared.is_dtls ? c->tls_shared.udp : c->tls_shared.tcp, buf, len);
     if (ret >= 0)
         return ret;
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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".

  parent reply	other threads:[~2025-06-25 19:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-25 19:59 [FFmpeg-devel] [PATCH 1/8] configure: require at least OpenSSL 1.1.0 Marvin Scholz
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 2/8] avformat: tls: drop support for OpenSSL < 1.1.0 Marvin Scholz
2025-06-25 19:59 ` Marvin Scholz [this message]
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 4/8] avformat/tls_openssl: properly get new BIO index Marvin Scholz
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 5/8] avformat/tls_openssl: remove leftover comment Marvin Scholz
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 6/8] avformat/tls_openssl: remove unnecessary checks Marvin Scholz
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 7/8] avformat/tls_openssl: use TLS_[client|server]_method Marvin Scholz
2025-06-25 19:59 ` [FFmpeg-devel] [PATCH 8/8] avformat/tls_openssl: use SSL_CTX_set_min_proto_version Marvin Scholz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250625195916.20276-3-epirat07@gmail.com \
    --to=epirat07-at-gmail.com@ffmpeg.org \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git