From patchwork Wed Nov 22 15:28:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 6275 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp309669jah; Wed, 22 Nov 2017 07:29:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMbYeGNZ7uCQ35baDv+O0H2PuhXKljs2YPBHlnKyoi+vdt0KuZiwEjFeDNi12w1UpZB9p8oO X-Received: by 10.223.163.11 with SMTP id c11mr11484911wrb.214.1511364576928; Wed, 22 Nov 2017 07:29:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511364576; cv=none; d=google.com; s=arc-20160816; b=khsi3HZuaT+onFqU9odaOLaMLN6zfjnInu9vBKEI+ffG72EmVgvZ9HJ81ly9sXVIW9 +5TuWzkvhoCSg7DAM8mQ3VlkFMjtqI5+iXUZNLGcKv9XGqkRyZ3iTZJoDTg9cQEnRw7F ipMZwVNZ0qP89TM61A2eq0X6qJt+mT2dtlVTl+mpVvSX22sdNbFwJ1DH0BUEbJAH+n0u MthQ/6Bka8eEv7QBflkXxjIAwigIQf4eD2XPTHKp2AIZn1ugxgGTsfPo4vJENF2AFzJc MqPp4cVCc+54eUsr4sDmzpTltXWPq0f53ATeYFhLVOWttj8A3mBG04pgK1ODeuoixoKo 75UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=SroyyiAajAMP4titaNyRAIZFHgmyBteX/MvwgUCYI+A=; b=pSxtUGj0kx5/KaqNibEJOUZ9ce7JrE/ASutTRWim29WJ6qktyTIMmCs8q/109wmNL4 YMPBfXIYQbDWW4l4KLx3JvZkQyT3epb6MTnWgH/CsHuy8SxO4DE5DZ7Xc41jwHVn21yu bj4yh5CIye9MWCN0bPCafETTJD4b55Gdiopp1yoHo85RqiOnj5P5tHp+xMVvwccJMAUF QCiGhon1r6v3Ef6Fw4LRIvflU6G/2V8L9/ci4PXfImkQIhGidIKvJ5/5PFXO8wYQwEIB yxWHEZqXXpOAFWcLX4gNsUKrl59LleKxJ4nHIOoyAvWU4neM4k5+IKOGACdSadg6QWIG DZqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NlwrPDiv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d1si11197373wrb.552.2017.11.22.07.29.36; Wed, 22 Nov 2017 07:29:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NlwrPDiv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21C2C68A1AB; Wed, 22 Nov 2017 17:29:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B3C689E30 for ; Wed, 22 Nov 2017 17:29:20 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id 128so10973167wmo.3 for ; Wed, 22 Nov 2017 07:29:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=pr7LH2XEXfj+Mypavj2PP6YLcQr0U4C8AVBCk0f0+WI=; b=NlwrPDivk5Xve4h947GqPOl6nkzgGe3CRXV1XRTaecjPMID0gXi0SC3w83hQzcUcDc AdB5bvv8vGN16ZYYej8Q5Tuq4XCmQ6MmWXmAapzN3DfHjVYhZMNepry7jvp3NbvwGLyf LQzx2HbfyHQ1q80GnIwc68+Vo53j8NBhgFZ2PO4llyghD3kh7zO8YuX8MLLZQe1X/ADi 25ONQeWedALx7v67o5wLRro+a3liNdzDKBCkEyL14xmStvN4azR2UbfDYe+oLQ3Op7Ab rrBArqED6MbPRzmBbb6Qlul0NY9K5e5QpdqOLLOFZPltPN8m/rjNpfpnsS28wR2PAkkF TB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pr7LH2XEXfj+Mypavj2PP6YLcQr0U4C8AVBCk0f0+WI=; b=iqfxdUHg0pGL6Phq7O7FSqjodiycWy8wg6v56hKncnSlZI0botxjPqqJjHy5BRCTyD 0CnmyZaJDBQI520Kmwn96kdMTPvVQdvzbhxyOZpy2ebRtaNJZGOYwME20GGV12X0xBr6 LNL2kWsG430MIssaAVuQDEhVkqlFkhFvwNeRF4Nwic74JLPYQ6BMQt1CyTNwGuc7xgCG cIBXKMgojN29uFwl4HIIegCouu9eq/7Y2eBtS+XnUImi+uBYuE03jYqSWchwMp3YHpWl valGDHP9rdXxtkB5PgIsbcvSDQL8zAUHbRFSyeqkjhHjlnqUDgrkRQLw92GMEJWLJVBk rtfg== X-Gm-Message-State: AJaThX5ycBZQ0HgVpI1Vs+8jnXT+0BnptHpRWePX/Ebx7rT3qhzzdiKY bm/1OQ+eunPL3+yjK8pXosOMkzvC X-Received: by 10.28.159.15 with SMTP id i15mr4274654wme.58.1511364560585; Wed, 22 Nov 2017 07:29:20 -0800 (PST) Received: from vimeo-vm.localdomain ([149.12.3.113]) by smtp.gmail.com with ESMTPSA id 186sm3664921wmm.47.2017.11.22.07.29.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 07:29:20 -0800 (PST) From: Derek Buitenhuis X-Google-Original-From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Nov 2017 15:28:40 +0000 Message-Id: <1511364522-40586-2-git-send-email-derekb@vimeo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1511364522-40586-1-git-send-email-derekb@vimeo.com> References: <1511364522-40586-1-git-send-email-derekb@vimeo.com> Subject: [FFmpeg-devel] [PATCH 1/3] Revert "udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 #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