summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-20 14:58:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-20 14:58:11 +0200
commita4f94f24b4f153c30bbcaa700bedfb2b3a581e5e (patch)
tree338a400a376fcb0ff951fe0006f085f3c1952921
parent7c6ebe2b97a6e05f07b766801c6f9ae52e0d9f70 (diff)
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@gmx.at>
-rw-r--r--libavformat/udp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c
index b9aa7491a6..bd7665ef74 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