From patchwork Wed Nov 30 22:02:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gregory J. Wolfe" X-Patchwork-Id: 1616 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp606134vsa; Wed, 30 Nov 2016 14:02:36 -0800 (PST) X-Received: by 10.28.98.66 with SMTP id w63mr32437575wmb.142.1480543356376; Wed, 30 Nov 2016 14:02:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x130si9045643wmg.27.2016.11.30.14.02.36; Wed, 30 Nov 2016 14:02: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=@KodakAlaris.onmicrosoft.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65E75689F52; Thu, 1 Dec 2016 00:02:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx0a-001e4c01.pphosted.com (mx0a-001e4c01.pphosted.com [148.163.157.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64D89689F30 for ; Thu, 1 Dec 2016 00:02:19 +0200 (EET) Received: from pps.filterd (m0087346.ppops.net [127.0.0.1]) by mx0a-001e4c01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAULoYxZ026093 for ; Wed, 30 Nov 2016 17:02:25 -0500 Received: from nam01-bn3-obe.outbound.protection.outlook.com (mail-bn3nam01lp0180.outbound.protection.outlook.com [216.32.180.180]) by mx0a-001e4c01.pphosted.com with ESMTP id 26y6smyecp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 30 Nov 2016 17:02:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=KodakAlaris.onmicrosoft.com; s=selector1-kodakalaris-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Mph3Xki08JleeZTMRgDzsPAdk4rExIyPP1rv49u+kN4=; b=5k4gEM/en03jGGEzoSPAJPp7LYS+lqQZ57TZQRKdPBH1J8pYiNSiZ4giI8KFElnr+/cBPIAIPukL0VrdEmloOpOxpLQ8y9EOLpwxIaV7vam/FZdNVyOEmQ2Hp8kYpZqaldi0CyGyBMAbCOUGaVHa/Oi77PTsj6pKBg1AjRY15zI= Received: from BN6PR03CA0017.namprd03.prod.outlook.com (10.168.230.155) by CY1PR0301MB1290.namprd03.prod.outlook.com (10.161.213.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Wed, 30 Nov 2016 22:02:22 +0000 Received: from BL2FFO11FD012.protection.gbl (2a01:111:f400:7c09::135) by BN6PR03CA0017.outlook.office365.com (2603:10b6:404:23::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13 via Frontend Transport; Wed, 30 Nov 2016 22:02:21 +0000 Received-SPF: Pass (protection.outlook.com: domain of kodakalaris.com designates 137.117.101.28 as permitted sender) receiver=protection.outlook.com; client-ip=137.117.101.28; helo=W5AZEXGP01.kaidmz.kodakalaris.net; Received: from W5AZEXGP01.kaidmz.kodakalaris.net (137.117.101.28) by BL2FFO11FD012.mail.protection.outlook.com (10.173.161.18) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.734.4 via Frontend Transport; Wed, 30 Nov 2016 22:02:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:645; Count:11 Received: from localhost (10.234.8.126) by W5AZEXGP01.kaidmz.kodakalaris.net (10.81.4.4) with Microsoft SMTP Server id 15.0.847.32; Wed, 30 Nov 2016 17:02:19 -0500 From: "Gregory J. Wolfe" To: Date: Wed, 30 Nov 2016 17:02:17 -0500 Message-ID: <1480543337-9300-1-git-send-email-gregory.wolfe@kodakalaris.com> X-Mailer: git-send-email 2.5.1.windows.1 MIME-Version: 1.0 X-IncomingHeaderCount: 11 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.117.101.28; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(2980300002)(438002)(3190300001)(199003)(189002)(81156014)(92566002)(8936002)(50226002)(81166006)(68736007)(8676002)(77096006)(39410400001)(39450400002)(86362001)(47776003)(38730400001)(50986999)(450100001)(107886002)(106466001)(104016004)(33646002)(57986006)(76506005)(36756003)(4326007)(5003940100001)(189998001)(4001430100002)(5660300001)(2906002)(6916009)(356003)(97736004)(110136003)(7846002)(305945005)(626004)(48376002)(50466002)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1290; H:W5AZEXGP01.kaidmz.kodakalaris.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD012; 1:QBL5lkEwzVLRd2qT1bDY3Fwuk7vqzmkiVfoVBJWxHfA2IGP1BJcZfSYISDHmBdfgJq40RtxlhWkBy0iFXEXm0j4uEKZSvSBL5gyLSM74FjW492geOlPaEextspY+lZvYewiDz1UeeoYx1d+K5oZODfgDUbKMyEMG5al9Q8kqUvpfwc6JU8QKxF7xfZ2MYejQ7AOxVaOFXasIBosz50xXgECHsfr03YSNoDWVlzJsLIZENcKpDEySqMXWv4GXJshJn06Q6z8chtsJxLYXASDvnD9T+4mn458ktp+7rU7rLEnI0nXTiHFR6Dp7alMHHLIYyUbhCRm8m5EGYt2GrptUthp1VLGiXhQJ4em+tExay/ilt1TTKSt+q4o0QuK4r6hLyAFn47EU55OXeiSXRg4PwXg66ef1N79RZzW8rzbQKEpQGGa4RGce+Y5sMfOg1QGm3bdBHsJeUgqJTe+ChpsCR4UWP8cvW1KzgQ+yzRzpJAQFiP7HA/YFJhiFPBGUlruQpNxYj3Sd2FOyWynhsL4leUQPi7sQ/8OC6RlLMXtO+LuQAf43MnEjgY8mqGYgC/WSQYSIvYEb+i1T3BwYrEzmXY1+hdN7ecCsIFAB8UbHNeVNkSq57L8cc8NJ+hevtCzQU39846pqRLGRMtzUAv0b7Iqhn3/f/G7VERpuAst5eGWQYoufpDuMuVMErGyEhjmId+Uoxxqioo3E50+eVqaKeg== X-MS-Office365-Filtering-Correlation-Id: 5905469a-65b3-4c5d-7925-08d4196c8ed6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:CY1PR0301MB1290; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 3:66hE/9tVYRIBbxhv+iHqAZmKrlFrgNLJV+NQbX5BTjMo0/WN9UwHWTHx1QNgbFcLtcZEMRcj74ufNioO7TYS+8C1GEOpJuYRbyp3ExS+xWKLz0e39veWt+/YjTY0XlVd12bgBMMZMBMq+Z0Wu7hUa5uxMJPDmDDRFYjtJJs99b3bOpBizp7edStkolSuPe42ZANNl2llEaPGI9OkfPMKbSlKP9Mcm9HrmBT1+O0yjAhVOTUJvmGWPPufxedUtJq9k+74zHiXNtq0TqZ9ZRuHo13d3b1QCqzfvgsjw8nIabsdL/2I0U43r2vbbjXqeoexNc6ryjCmoLrHK6IyyylTq8MP3bIbRVNDfxV+xFreXO0hXSOBaeP27n+x/AiOrJIF7tKR6UrizXECBY8GM2HCKg==; 25:dS5snahBIgNMy3WgDJI10ieWx6SGJJYZBBtaZbbrvUFgObtdwFBKifwFZwfoSKg/Greg7O6xFtCjHMyzLZxt27z+EyRDdrpWKUY6LCZADu44z18P2B7DIPWQw+s+ZeAvQ42KqhTLQuC7XxJRn265Xe41GbTA4tw1BgSe3z6yug8bTHZ4ENYmYiw3JldxKmfPLsBeYKqeFuP9vaj0bZTYPDi/7ql0JwvpRNuTsnApBFNwDdnQIBA5NiTcwdSRmyM+L6QhqhX7UCy6pC9+A37QHe7EvWwqY1kttjXamcSRc34cMYJZFSBOhoPPpWVJoPZuo0eRLvok/2MBMiIDXo7+uuU6a2h9VJq0Lt9BtcS7200jex0AimH5fkcyTZB790Sn4dmbXtNjQEboqxk5Krhjls9N1ZQHhjy3ae80Eb3D0sQ2Ru7rgCio81wl7+b+lC31YNDdZTj3TZ6s4bp3X9Q3gA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 31:pDBwzq+kdPdBNZpolqsYYiAZuN3IPTGe+IahUL481G3vi2TcU7szuHEwqFdMaa5FgQhYOZ02p2kkKVTmygdNQj9Av1vuWUfjWlpSlSJgQ0HOhrdu74QqmYAgRA7MFndITLNoOIIDbPQA/eQRAW09SduSM7UA2qnudRIMGBrcaCApLfD55JB4jxGZNhrtsDmYv+Zhy1Thz+BxU0gB0bUfluaHZf8gWCzkbkkL3knLxA0LqHdyqPC5wdqkCVqfW+M6fvANBRQh2qYp/2slFprkr6KPVZXDrm4HRzQJf6U38As=; 20:83vfwvpsUSHgRuo0GObbP+GW+vhMiAIilbTRHmuLuDVBirmbx+z3NrKZNbu42rAid1MPAaBG/xM4iSWJrZyWa4k1YYiJn4Qih37BTA6El/sFoGwe5uePWebp1svSVAfeaFcga1M49GBd+uemn08UmgZJE7hsjIO0xxstDJJvYAR+f8TW5BnUN5GQZ3OBCwncN2VVT8C6DJ1F2rHizaOWx0uOSQD2AGevQzDLIS2kbFUlgBCFyYWnqS/bYabKdU0EhSTtbMmu+2a3dWnAGPCjmNZIdJ/HIQ8DqqLiNZ0v2X236iX/4TsmJkhinDsGWkybZ2TbEsKpb41hbaL8x2CIMjnT4gQe5og42xhn4O3i16STj2VHfDjBsRTkO0Nl7DfSzFznYXxmRIMLbljK7yfRIVJzZN1jvLthulmPTgMY2OpagqDY/uPbag1Sp9yREQgpdJjjQXeTpx9zDeIEHxdsEBIbRpgyc11NyMnGtBf39KtGUEso9nT6nZ1On9qaF+d2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(13024025)(13017025)(13023025)(13018025)(13015025)(3002001)(10201501046)(6055026)(6041248)(20161123555025)(20161123564025)(20161123558021)(20161123562025)(20161123560025)(6047074)(6072148); SRVR:CY1PR0301MB1290; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1290; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 4:Eqca//zfPDpq3tMazrWvZevGfTjExKocsqMUNGa4T57d1IfBSleJmwkbtjX9+AnYfSm4ZlQfO8l0Qm8vJwoP7t79O7P9Xt4B7ggBubzBk7RpUo4PSLekhiUeqhJecfaMcC9eKclfCbvK3ABaCdFN/lvm2yXGF/lW6FyiGYK+a/Kt65w/QZD1K8ICE/U+S81ONy9gqdUu8n/21affihsxRXpbwioOB5X4hpM5ObpexMsA1gp35BMspIk9mj6etRLxkQlxE5vmoZHLATXOI2gTVoBdJqt/zT8h3Y2x5g7VjEdViwzyrFSOWJI7GHbYhfuovucKwp8nleqsPsMvktmkWQIOQKuR2K++AU74jrwD5xPrwbP/zLxxSjKDemIbYrJCWbU2KMqaJBFNSiTN9k4/3kj7by/E4tmw0TSCk5kR/rBG65sMPORqcnqLFk51uEnPbkgEZGLLdoR6TRhWzrnCOL09iTavZ+TvQHuTc0QDSn+Yy7juXLJTK/xd3I/AUSuB6eWwBqAcuBOb+B5U3A+7vw1iCb8KJv+oHVymlt8W9ILAXqmMFumP6D0PmJZ3sTJDphWWfNY1NT4rw+jcZ94UnAJFpurtOp73QpkRA4QCzDTyPInQ4FKxlolzv7PQ9bdwX+z1H5FrzhyUJjIoGitoTQTi7bd0C/FNYoyj2EnvHYNfHqezdHg0SQ11DUfzyN29/PU1qdVdepdphDoaJPduLZm23xAtV2bLQ7MgC4gjEbs= X-Forefront-PRVS: 0142F22657 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1290; 23:HSEeUaXyqfjoOz/VCUK2bW4aP/QSq8gnWlypHI5?= =?us-ascii?Q?+JfjM9ayetqvDq4jm/sgco6s3MifY8ES3FQ38A42qu3Puz4GEzl2a7aUWNiG?= =?us-ascii?Q?JxYoy3Fz06PgbKDoMjubgiynzgGVDnBvi6Wz2pbIOzRy8VgHW3cG/4XHCELN?= =?us-ascii?Q?O11ZuB3L1dWYGXf85cs4Pa28hrS6yXdW2WMd5cRXcjuzbUWUh7V7rLrvnXeK?= =?us-ascii?Q?Doc7LQcyxhUGUyVlwKBIuA6lWuvnxAGqgLJgqH+SVVow4DXOv6ekWKVMb3VU?= =?us-ascii?Q?PVzEtTdahFCamYLRCqtXUEDnfcZLQ9woJ2cVeG+wl5n0Ql1nhScla4l093kZ?= =?us-ascii?Q?Zz+rvGh9OaLh1gVJJh3RP8oDVez5Iql60PtTfzo+DN5do544m9WoI8IKq3JZ?= =?us-ascii?Q?7n+DS0LRLpf7o2H6JIILxLC/Iep1bfUCywz9LXeCZctJUJez+23xpitW9v5X?= =?us-ascii?Q?WKX7LjcNVxvdqMcXSdMyMRUJX1qVcMlA397qnUu5TA5U5ZBXvFf7QlSWbGnb?= =?us-ascii?Q?EAbfvE1XPVID2p+rJLfCbo4cmLk95uQUal1jWGl8y/bCo+2PbRrFAPdwhFt7?= =?us-ascii?Q?wYT5TW9sic3EgwUbad+rh1L3Oks5xHbRx1Z7jhoX4kqsx0c+20UyODq1oHJb?= =?us-ascii?Q?82nJWpXa2bN+x/NWnsot4fL/IYmRGqnCaXoK+oLge5k6dx29icVU+ASzpuUz?= =?us-ascii?Q?33h45efkYQ1FiLZXvo5MceniNLokrHovLYnS2cm3SYgX3EVnnjjideJoYpTc?= =?us-ascii?Q?lI3q1D6CK+PZmk5HKNj9SSQ6iJsZ1z1/w13zF48g5mJR2se3lB6xrgvTvqHz?= =?us-ascii?Q?mTuVGJWqmXM5Ne8jIoZ5/fSda4imcmutaX6nI6o/8qNQtCFy41qnrBAkvMID?= =?us-ascii?Q?YbEMag6+nYCu9s2/RM7XGyVJXNz4nhnePFGiJfNVOYf/TQOptBPHYHFtdcv7?= =?us-ascii?Q?LZVKIornRoQ0ZWXZlXOJcAk0KEKvh3tp0glu/NQzbAIAnaZLWYlMY/pHY1hL?= =?us-ascii?Q?VhtybiGUfquWWdZILshmWRCtVKh2/PsWxiG8elB8IyZOIB78IyOLGOEHtbw4?= =?us-ascii?Q?g0/xjyFIymn2409ErH0LNoyirKNyjys8jGK/Z7QlXljFENKmA1A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 6:IM2OV3XJRW89jpKxabtocEpn86J+QEid4iB/VBUdTJ3ZC3ZU5lFlx7vW4Ad63Uz5m9dNHkJ3B5kJULaLmYeHpSmWZJ6iRQi6C5dyhfrmkGaomUEUaf/uP9z2lUoLfgMQ8LyHZWmRNvzTO2P2UaOZ0l9u17wAGaSB/x6WoILgVNoHzXoSY67upSvQbB1fcREfbm7VIlCJVBgI4/x3SI8f2MvwweY7bKMtBUTxrxEH2Wcr4Do4vsB5AD0iHTAdfCOgJBBNGmr4FkmDFsa/15prmZ8LdJ0T22vTQwhcpruTEikEKrfIGmqP/YNO97sJWNgjpkf1usDw2UwuenrKhkPpWEOb6NfRkHeEZ8O8UBORPRRXa2dl6vhmV3BbWA/noSUwSE7pHwHmXcV/NDUf71+0o/ougKBumf9CcRBb3bMVjwBOWJgJ0CMqjngTCKtXjq9QrSHCN/D1TSUebQmQkL5rr1jNab7k4E/WpY8C0D0TBIVCQ2cbSBBrh4/Aje/0+3BG; 5:3aIGWcGsM6DI3sIlQJAhWCEO8SAImMceT+APa/p6QMU7i/PQft9h4aBpOGkMCmhVTeVBNER0jfFQGd6/9tWM8hRgkHJR95bT+4gK6gAuLLf6qTAWi3XB6Y/RjUSiK2esCXpgaPh8vg3WngkKQWImZQ==; 24:WdmKqs66mHPjZPPcDZYmW2zIZ+yjjmkpn7CNhciS7ij0DaUZq3mjJDV6om0r0Vt7zDsT05RiDT1Wi6dDwgsj98++rjlK5ywJwjy7E3fxogs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 7:xnX9kZarUp/1l0Sq5gVYVrdbCpLPdYhhtw9UsHxPMqtWJh9VtsCB5yZy+reuJU228BGj1foBTUnj4Cwpk97nSOYWOA5sDnEB1pM6mCDAzGONFRWEgs3twY6XuEAOAgBxax00aXyx4gmR8P3Psi12ZiCZ3fGVYRr/HCR3qt3c3e6uyO5PPM5mgvqGuU6LktVc3R3sZj6EvkRIJSwqwLJdLZ/y1X/bSXUBcoAvT2VUvBRzNsSk6JKbAKQp/p+w7yIxFInDR/kbTJCcyT1Y/1VIkZ4WP3OlvvYx9myh03tFgjhhSesIDWWIw5z80+QguWSn4Vy41FipNl1nevhuGA4eG8vB/L3ptpV/HQbDgDrAGqF+eGZo94ojAol20UX9/HmDseySg4k4+G2uhR2+U2WdZW+CHmV7wHX7rth7cdZn3m9UpMlG/yELyzPq11biz+rQempcvW4mJmwIy/ekB6rrbw== X-OriginatorOrg: kodakalaris.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2016 22:02:20.2333 (UTC) X-MS-Exchange-CrossTenant-Id: d29b7a9b-6edb-4720-99a8-3c5c6c3eeeb0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d29b7a9b-6edb-4720-99a8-3c5c6c3eeeb0; Ip=[137.117.101.28]; Helo=[W5AZEXGP01.kaidmz.kodakalaris.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1290 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-11-30_16:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611300351 Subject: [FFmpeg-devel] [PATCH] Define ETIMEDOUT in fifo_muxer.c for MinGW/Windows fate build. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fate failed to build in the MinGW/Windows environment because macro ETIMEDOUT was undefined. When this condition is detected, the code now defines this symbol the same way it's done in libavformat/network.h. Signed-off-by: Gregory J. Wolfe --- libavformat/tests/fifo_muxer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index 9659198..97f798f 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -25,6 +25,18 @@ #include "libavutil/avassert.h" #include "libavformat/avformat.h" #include "libavformat/url.h" +#ifndef ETIMEDOUT +#if HAVE_WINSOCK2_H +#include +#include +#define ETIMEDOUT WSAETIMEDOUT +#else /* HAVE_WINSOCK2_H */ +#include +#include +#include +#include +#endif /* HAVE_WINSOCK2_H */ +#endif /* ifndef ETIMEDOUT */ #define MAX_TST_PACKETS 128 #define SLEEPTIME_50_MS 50000