diff mbox

[FFmpeg-devel,1/3] Revert "udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined"

Message ID 1511364522-40586-2-git-send-email-derekb@vimeo.com
State Accepted
Commit cce33ed10fdceda7e634ed8b01cf616d34505924
Headers show

Commit Message

Derek Buitenhuis Nov. 22, 2017, 3:28 p.m. UTC 
This was an mplayer-specific hack.

This reverts commit a4f94f24b4f153c30bbcaa700bedfb2b3a581e5e.
---
Near as I can tell, this is a hack added to deal with the fact that the
terrible mplayer build system cannibalized FFmpeg's, and failed at it.

There's no reason this should be in FFmpeg, if that is the case
---
 libavformat/udp.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Paul B Mahol Nov. 22, 2017, 4:41 p.m. UTC | #1 
On 11/22/17, Derek Buitenhuis <derek.buitenhuis@gmail.com> wrote:
> This was an mplayer-specific hack.
>
> This reverts commit a4f94f24b4f153c30bbcaa700bedfb2b3a581e5e.
> ---
> Near as I can tell, this is a hack added to deal with the fact that the
> terrible mplayer build system cannibalized FFmpeg's, and failed at it.
>
> There's no reason this should be in FFmpeg, if that is the case
> ---
>  libavformat/udp.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/libavformat/udp.c b/libavformat/udp.c
> index 3835f98..0dde035 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
> --
> 1.8.3.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

LGTM
Derek Buitenhuis Nov. 23, 2017, 2:21 p.m. UTC | #2 
On 11/22/2017 4:41 PM, Paul B Mahol wrote:
> LGTM

Pushed.

- Derek
diff mbox

Patch

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 3835f98..0dde035 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