[FFmpeg-cvslog] Revert "udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined"

Derek Buitenhuis git at videolan.org
Thu Nov 23 16:21:21 EET 2017


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Nov 22 15:28:40 2017 +0000| [cce33ed10fdceda7e634ed8b01cf616d34505924] | committer: Derek Buitenhuis

Revert "udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined"

This was an mplayer-specific hack.

This reverts commit a4f94f24b4f153c30bbcaa700bedfb2b3a581e5e.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cce33ed10fdceda7e634ed8b01cf616d34505924
---

 libavformat/udp.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 3835f989c4..0dde0353fb 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -64,10 +64,6 @@
 #include <pthread.h>
 #endif
 
-#ifndef HAVE_PTHREAD_CANCEL
-#define HAVE_PTHREAD_CANCEL 0
-#endif
-
 #ifndef IPV6_ADD_MEMBERSHIP
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
 #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP



More information about the ffmpeg-cvslog mailing list