This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 74bc79e47552eddfe14ce18d80eb0a96bb9337d0
Author:     Jack Lau <[email protected]>
AuthorDate: Mon Jan 12 20:02:40 2026 +0800
Commit:     Timo Rothenpieler <[email protected]>
CommitDate: Sun Jan 18 01:57:56 2026 +0000

    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 <[email protected]>
---
 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..36af03456f 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;

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to