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

Michael Niedermayer git at videolan.org
Fri Jul 20 15:04:26 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 20 14:58:11 2012 +0200| [a4f94f24b4f153c30bbcaa700bedfb2b3a581e5e] | committer: Michael Niedermayer

udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined

This happens with for example mplayer.
Fixing it in ffmpeg allows new ffmpeg to be compiled with older mplayer
which would not be possible if the fix was just in mplayer.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/udp.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index b9aa749..bd7665e 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -41,6 +41,10 @@
 #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