[FFmpeg-devel] [PR] avformat/tls_gnutls: fix build error on linux (PR #21435)

[FFmpeg-devel] [PR] avformat/tls_gnutls: fix build error on linux (PR #21435)

[Jack Lau via ffmpeg-devel]

PR #21435 opened by Jack Lau (JackLau)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21435
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21435.patch

The fd_set need <sys/select.h> on linux, but it's
not included in os_support.h, it's included in os_support.c

So this patch use poll() to replace select() to avoid
this issue and simplify the code.

Signed-off-by: Jack Lau <jacklau1222gm@gmail.com>


>From af9f2b5aa0c91285f270ad79a7828a0994cc5e83 Mon Sep 17 00:00:00 2001
From: Jack Lau <jacklau1222gm@gmail.com>
Date: Mon, 12 Jan 2026 20:02:40 +0800
Subject: [PATCH] avformat/tls_gnutls: fix build error on linux

The fd_set need <sys/select.h> on linux, but it's
not included in os_support.h, it's included in os_support.c

So this patch use poll() to replace select() to avoid
this issue and simplify the code.

Signed-off-by: Jack Lau <jacklau1222gm@gmail.com>
---
 libavformat/tls_gnutls.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 6f58ec03d2..2170dc4fa5 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -172,19 +172,13 @@ static int gnutls_pull_timeout(gnutls_transport_ptr_t ptr, unsigned int ms)
     TLSContext *c = (TLSContext*) ptr;
     TLSShared *s = &c->tls_shared;
     int ret;
-    fd_set rfds;
-    struct timeval tv;
     int sockfd = ffurl_get_file_handle(s->udp);
+    struct pollfd pfd = { .fd = sockfd, .events = POLLIN, .revents = 0};
+
     if (sockfd < 0)
         return 0;
 
-    FD_ZERO(&rfds);
-    FD_SET(sockfd, &rfds);
-
-    tv.tv_sec = ms / 1000;
-    tv.tv_usec = (ms % 1000) * 1000;
-
-    ret = select(sockfd + 1, &rfds, NULL, NULL, &tv);
+    ret = poll(&pfd, 1, ms);
     if (ret <= 0)
         return ret;
     return 1;
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org