From patchwork Thu Jan 6 09:14:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1473831iog; Thu, 6 Jan 2022 01:14:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAudlM1rMiZXIHXsIMUf3eGllwy/0arqD+dEXBWByuxM2j35KdJBF7Avlx67rfqSZ609Xe X-Received: by 2002:a17:906:4b5a:: with SMTP id j26mr1089215ejv.674.1641460488106; Thu, 06 Jan 2022 01:14:48 -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 e10si933626edz.281.2022.01.06.01.14.47; Thu, 06 Jan 2022 01:14:48 -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=@outlook.com header.s=selector1 header.b=SC4JmQEm; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5207680867; Thu, 6 Jan 2022 11:14:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2101.outbound.protection.outlook.com [40.92.91.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68D71680867 for ; Thu, 6 Jan 2022 11:14:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bUj7huelDJg+g5G7z1KEz7mZB8OJx/Q8HBNH5qZWoIp5AHdXL2EFTbpeQGMUarS8CdoG/KCly6NYxp+5kkJpBjBRC0u12nb6RoSUa4Ofriqe9Vg+nTqvRiLUVBNR5L0fXCMtydMm2QgiJJcUzU5lP7ZnC1Unl4plGn/vM6rg2gNLQgbnhlb/P1pCB+jtRyqc+UEF5veS9jBjT3bHRKTa/BVRZKMGRWwXU/5xFBIM+vgVgUj8APz6BubJ7lSnAUj5KVBGs5Uo77fpIRtCq9itj8+ivNv8fbQCz9LqIEfKKYpRmpsdiv3t5VgOQpx/5YHiUo9+SM+MePH062AMXCe5gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=494vExP2h/xXEwYyHeck3R70SvLEDBfM44v3DuUJCIs=; b=l0HAY3jgbhaac0RyTMUVTaSt1lW3HXBERM/6YyhNrP2ZQ1YlX9Rg4ICQClcEQyHUxHgYfJexy0BLWXzaDXJ/D5wkE7RiTJBrjVHRhnx+H+ADP/z5J4H6xZTcmG2PMKUbdwSsQh7caf8VkzA6QGrf/9qlIqSvqTF6K4sIdkCS+XCiGV0VGKJFZzLjZKP4NwujlWgrVdYX2SjDLdy0bYFqHSdw+Qxdvq4brCgxOu8B1GRekcPWbyScENWm3RJyLJrWqd+zZnG/T2x6YiPsakmEZZTJavvIG/qfzgPOXAijbzfTq4B3WaTMMc0baExUfHzuW7Wd7xAwSo4C06volG3tiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=494vExP2h/xXEwYyHeck3R70SvLEDBfM44v3DuUJCIs=; b=SC4JmQEmCDSKhQpi5r6c2OmCyBVQE2YIC5/pPR9zAFRyrOwkkXnLvQiRGOINLeJlKQn/VJIL3HwPURvbRCKL7nRt6B8F6+ZIODZQrEw4ttKvlw5sUKdV6MAAuHniSjiea//wsKJ/ZWr/VeatZzr5nOjO3xX72n0Vg444hHgmDyd86Un7lqWliwNnk1eI+wE5fJnLDER8ipA6cllvGxBDKJ3aI0aG/220UdGM3NVfkJhdh65W+82Ok2dccDkYhi4FLe5pCirYLdHgnVdZOglPIvwOAaSOAzDLbaGCSlpwtjeFuGn5OTX8VXEeK7Fuecq2sdArF0jsJjk7cRZD5eL2Eg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3957.eurprd03.prod.outlook.com (2603:10a6:20b:15::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 09:14:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 09:14:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 10:14:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [PSQ/n5/iAaXbr1QqOhdBeePHVrzIhSdm] X-ClientProxiedBy: AM4PR0501CA0061.eurprd05.prod.outlook.com (2603:10a6:200:68::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106091430.1411614-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b681e6c3-387a-4efd-89a3-08d9d0f4f61f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybvnh8ba6Gx8a1ihEvN0VDGe0qwg8JRFrE/dk6pI6ng7u4kwaf2ReOe+A4RFdj03tBZJZt3q/1QWgToPecij/sZiivmVsbuSbkN16OoFiI8zA6FEcx9ygNK0pakXVit0zCCFcgMLJy2lAztKr2rnjDDUwMpRnU6JIpxkCJsIXw1CtuYt3oSbtZSbdTPmZw2imoTZHK9KkV4U8TbPdCV8IKHa34cbQzrdaXz4AygiGYCs6JmLqLECx6q9V5FHLc9GC9JB8G4FNZmwbpfLH66vRUKqXTSgOeemFfhZBca1ef43Ei5JR1DLs7KENsOWuh8Nn7SyPFYBqLRXKpojBVyGpDe9+yCFwuBVMNmDcR+vZ7q8u60HVIjDtRRfUor3Uf0Gu7F1P+vPcHLMVIIaAGLirgUc+KkySe2LNMO41w4EAV4NJ+jHflljRChla8Ojofykc/0HYk311iC2U2QFmP2Os1xTYjCixigbIVh/qOHovefr03uPwNpO+n9i7BC8RwYnw5cl7vuDtuiooTgo44JFMpzgaXZycnzNttlIPJTftFIyAoWMNbs+LJDhxqmUkK5rE3Y321a/mVUuVJYP+WeLja0lCYAXVRkF8m6+IfXNjR8316saU0muv0SV8PpVj7k5m4qPDO3SLSACI18lx2lL37uMLV0+Ke1U0OlLIDqugnw1xx0sxEe5s3ED6Mg51FjeaRlCT9UE11Tu3DXMdfmj10faEBULljfr551AaqERRXsiE3V93UA+rxmc8RllJmuMw7 X-MS-TrafficTypeDiagnostic: AM6PR03MB3957:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mhFRRWeutiTHBqRVtqw3+Ehfk15MdW3wBteQrmomV7lG9+R7CQfrSnd6+SmxFckMBNZU6TaBUB0vOmY/mXhnrqPPN5XOS+cEqROllJGcVRvqD00ugrHSX5cOYNTRuQYS8GlpjTKZK/9k4gMnC1/zQNI19Q5djoS0BPnUMq9Ao7lVX7Yl6+2e8mWd5tJjdvxhIu0V4Ean3WWK8o26EG44ypXzU/x9hQEBrTXrripN4kRjK+HyWBBoHHLtDUuQTRAgN2iOqqSfwarCvt1ZiXcEIkPnx7JCVZqGVAyRILq4YQDxvUB9BhULnCOhREkeepVZLwwSiAhr6Mi1TwKz/8QFW6oFXYALhBIqn0qGict8jEQ9xZzO7JQd3bvMcwgClbrHZYFGtTo6fcdIgO/wZFJdpdwD2jLeDKebRKV4IZYJkspPCRXJ9r04XfV3zadDmKTDrWWP9YySE/Es5ElCO9GoeCrlwKBBNYyiDu9F8u4KPtFSbZvJV8mQnz6DuK0r/u23MpXSV+HlFIl2ywgHr4O08gtZZJ+QdsykwS7GNbNVkZR9JgDNyyKrTa3b+Wit7DpyJ4CqLhk63JxUdkpynXr+9w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bEXGlbe6FVfC5fyF7hjGVaKBNYyn/bcygOGepwKt6HYFWu7JpszkLDW/fnlrhRPkQMiZKa7k3EoIZcLmWSusROy/+7r+Fsx0u6BKeLPU7esjCi8c/SQhe+oIVJJmcWqL02ykcgzKjnqrlEbQ0RKuoeHiwHfGagEYU85wBRfO4kb2jG2/TvTvYcGHDRSoN/berxW4/Gd/RrlJWfRJACVcQgjH+OcPX8phFgzZC3BAuvcHP+g7ECvRFatlUf3/pFhBqoYEuALy22XZShDLcnwGa6A72+MXFqn8XZqtwMmrxvul7Xb33hnwEYrsQEr7OIucoLIB7HsgKlg7R1vcp/0ZzeGOMBBdPiUle86oOjyQtvJGrOv8wW4h+I5tHtCaqzMS/SpwW1W3jg0syOdFjjKqq8Oo0wQh9Js3mV/4RvSJO/6CU/53wTGGH2sW9A5fbIwA5ev9gMF71YUaLF7NDHYoGd9EGk1ETXDTZ2ANlEkFJpmZLoEYNeco1V1X32DzTn/7PHUqjCz8KiIu4orwAfHmIZ3mO0Sp480I0C48WKvK3IZiAvpGOmOD681hjszhaJ24UoXgGWY3YjLPI12ObDkASgmE77XV+oPDebLSNPJJJEi9SdQgEQug8YpXWa7DuS2nFeDaotzXN9UhHeiLnmomuLcbbBa++TGJkVh1mPRkXs5QZ0JQ6KtDLYT437R+lcYOtiYW1w3LdMBQSb2uS6ujoMQVNbjKfL4FKSn9ud88W2/qARQ3dW+6hyQU+VBLK3Qc3PWllg7qSjejbnG1o029gnPhgLTyFwz83LIfpLYx7Abdp6P91fYKHgeyBS9x/W/xFwIsohIACI5EWkiXLjjKD60p/D5pExwd/fXWtQzJIa47thXpy6nEBgYELRVawl8MyeCn83S9pkIlwm1fl6Nw23YwQQ8ovo/oKvymXjq7KoURarqTT6vNpzhXH7BY7tNsxtHXhuDEJsNGcUjs28ql4w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b681e6c3-387a-4efd-89a3-08d9d0f4f61f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 09:14:37.2307 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3957 Subject: [FFmpeg-devel] [PATCH] avformat/Makefile: Add missing libamqp->urldecode dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F+rEt04qvNO3 Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index c479ea998e..cc19325397 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -667,7 +667,7 @@ OBJS-$(CONFIG_UDPLITE_PROTOCOL) += udp.o ip.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o # external library protocols -OBJS-$(CONFIG_LIBAMQP_PROTOCOL) += libamqp.o +OBJS-$(CONFIG_LIBAMQP_PROTOCOL) += libamqp.o urldecode.o OBJS-$(CONFIG_LIBRIST_PROTOCOL) += librist.o OBJS-$(CONFIG_LIBRTMP_PROTOCOL) += librtmp.o OBJS-$(CONFIG_LIBRTMPE_PROTOCOL) += librtmp.o From patchwork Thu Jan 6 10:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33113 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535040iog; Thu, 6 Jan 2022 02:52:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLzSQ01mAd1lkx952ftCYEUHrYX0f8LK9OljkFJx60VUrDEK55i8JLZHNrGcL47ADNXrzm X-Received: by 2002:a05:6402:230e:: with SMTP id l14mr47718208eda.370.1641466368326; Thu, 06 Jan 2022 02:52:48 -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 my3si781312ejc.283.2022.01.06.02.52.47; Thu, 06 Jan 2022 02:52:48 -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=@outlook.com header.s=selector1 header.b=FLTiVGLO; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D02AC6800CE; Thu, 6 Jan 2022 12:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D20906800CE for ; Thu, 6 Jan 2022 12:52:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ED0kz+2SV8w46TA8fd9Lrtf6d5mPg3+4FfOj/INlY9KFEiC8g24Id/8E1q4W2v4nOzVls+xCGEzu2fieL202MbxDGK9F4DRLUc6e5/oKS+kofkMllSHcN/Fzdi+SJAZG5cLS0Y3ZXV3f0nBinCMXngW7dfgYdEJhd5ae0thRbQHFgrJSvl4QjScz3+5aQN9H0vxvMeLVvpg7MSYXgT4Jhut3rzsDwDr3sg8/kNGcHjMowHn9ODSu92ArxMIsBe0LPXhIgy0ZpqbIIfbprCwHYkx7Q5LlBLADAdzMDyqN3HXqIca6W/LjeSB5T2j54kSsQAvIng9gpGfowBPIRPxYQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7gFFSKTP446cotulPerh+P4dWtia0I+um/81D4L3JaI=; b=gXHBaP/AKJorlwH/33tv+W7tPIUYwKYcz/i7cqsSJ2cdblGvCzxUgv4LbQW1OqZ9c7tcwp9bvNYZbw1puh7SV7OxWM3eBosPZ+4xQIsdCFcGkd0AGJ841TRsgN/+NQtmiUl3E30UnCmoK5Fpi7aR6YDKqFEZOVSPv0yOlBcPQtUxR1Eaj4AOK1elQ35l3UgkbyWvoDEIQo+7xi6Rc5+wSg2BjJpuhjSCuZrm3ISu38fIQnqm/dyLdFyIqJI8h5z0/EFLroZk67CBB8cJ3KhTyCaXnzzaC3U/F4z8izF5AEb302dW+q9WGbZsAOh44tr6IXBZfddD+IydvLdtYvYT+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7gFFSKTP446cotulPerh+P4dWtia0I+um/81D4L3JaI=; b=FLTiVGLOPEMger3a33OO40mTdM36QBiGfG1RE+BOktsaNoJyW3GIHhu0JgG8tas7jfmfGEuQVUVHzqZq+GLsvOdmERxomzdIUX+AOEFzgrOyc8JxEazOHW6p8/K8XnP1BB9dsbyMC2ywjANbxtWKIC75FYm0/jNGsBcY8ma2V5oQPxdMF+bj3GBXtyZH3GN8iVGNhu4z1RPlAp2DAGzGmjEbRj/FkT0TXkruS4igBXUKr0ryjUzpzlClF1qf/bcm2Q+l8dhmJJ2L1JhrZ6Wz4/BfaVEC0i9DbRa6H8NuO7S8sr3NC697OcmV4S2A3nUog/XYjfEw7qfp80ksiWrfeA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:34 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:24 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PMgZFsPBTTwsxpTt7pDiHv0EImnkx7Bc] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5095791-213e-490e-900b-08d9d102a52b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb+f34X8jJfHg0y0OCywpiV48ItgUA5dzy4Ekebc+hN73RmFP/qTKKOQyl9Uwlzm7fPXsg9E0rkmDGHjxH9eZs9UuwJ5ua3SG/+1IDSU8yfiviXfzWO0xIRiKZKfYBhEwEuJb2x5LCJmZ4MzkLK5eB2KQlEj9ajuBloTwZdL7AJLqt4kXfc0pWiqTbG/0KP3scc2iFFSM+vRwMbCKdxnh5g9uBKslv0BOOjZpne2BUh4vmHsO+BUIfosL6Dv4q6YPl1HYC5AaoHYHuJPFomqLK5S3JYbL+qJHgLgENZH/949fHjw0qgE5U9s6ksXRA5U3KEO9ysAosUI2g9odG7RAqkDx4qXtStLzPSCvEquxVDnJ+Mb+arcyTcNmpfZE2tKoqcaCoIp1D4YGpW+5vt/C0exfV7GW20pKkeCwyFSA0iff4e1HWmOM2grcUWlowSXV1zkwCBmVPFkBJ8QL9Y9xqRNsAzGM9gabgeRHJucVZ/zWPFZYF7CW7Hs/Tmb+UUSOz0n1ii3c2/5DUM7ANTa/4dAjZP8KHUOMxwaSxYldV6eARNg7gFsFtT5AzcX7IvsnSNXvnyxQcMTG1YlQR6Pp9UiXtxxexKwmVl8jAvBqn2RI7mwyoc9A6xf8L3iD+yu+cO3S47SM80NkfnrbgzEJSlm+uQO+lgZ9op/5kg0VgLlg/lP7WZc6HzujCPgujIPcAMt2WSrjz2gryZxQ5I8XVRm9NbgMRMT0PJnjVI/iG9eXFu0+blX82UKPe7ovQZHuR X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2Axe/PzjG1I/NVL6yAYxEz7kp73AZlScBWIH8bCql5dzhpTt2WvEkxJeKUhUg6MEqalZAuvBkuFKCpblVuC/KmoOkmRkFD+lil9xCD340Dc5ofAzZ2Q6UPXAteaiU2LtY/r2G9qUwNDz/ZcrlLWT/+yaqGb5O4qlINSvAX/IpTvtFeIMtESnJXEDrUxU9zwlCcxCEMF44xB3E2uy+i58XZijaOPKF7jePgV12QAZv3pIfaZuuztw8qMuH7YJblTIHO2TfLR/q8Ax5OCaXWv4ZiYkVpAkCKsCVpepTERPd0RoszsM/jSESf3daBRGB3VHMcQVN2tP2bGdFgAzsr4EoHXSi/heJYn/Iw1uW9hV3eZmihVDSQkx+d2RUPbiyku3NWqNVa+bPazVe6v4OvrNvcbrtqara7CxCSqQ96Tg0n0VoCYdZB4YXWkVEfYOjMfkNtWA0kiN9NSdXnMi3+Q5M4ulBMRfzEx4GAWJfc07W44TXlikdG4Y0UvthpSpeYOHYJqWp6dOkUQ8Ja9eqNaa1H5RwUIXwsqx0TZr3kWLpdlmpyyb4nINQWrKkRhbJUSnUz8qfb3HklaOcflUenXaw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W0HHxkNMC3FeT2GOZWI2rq8b1Rx2J1Ry/f6nvqAd4FhwI+k6fz/uhWJn5LQJSpLLJwKp7wUNPQCjxnB9ZA9OpJwc9FeRDlGcRwC6JDLaI5whC10dj5ShVGh4Eeyg4OMkWl4LODvRhPwUGk8bqiLm0sQ76YfR+he2zuUPvxCVi0vojbPL4jz0Cxnmk27TfRYjGkdocQHMFzYEJRszp9UJyGJ8QX1lgW41LCNpKVfzUBiUoWyHuuIvK5NSsc1Z1Z3t50akosJ459EdfWhm+Wb5qrkXkTqeiScO0jRM2OkJl8/MsnNvZ0/tOVuPTjeIkM9HbUZt9drHzY5OYsZdRZ59LhhrKRtfJqYYsMmnOXv7pRbDQ9X9APwSwVZeLwtd/6WX7e2KkhMZ1Zl45jbB5kQ/JmrW3zPBUGo6mPGp/BI5ITu1YJ+F1yUoCHQQ7VMm/5bUPxhgnC/gaDRJVdQbSk/zr5yor/lSFa5mGbakm7A7JVxRz/OOJ4QwaoXjnfUYTAG0yNC4KL3vHCl46o93VN1noIrrpvCAjiP6j6LhW12AsDQrZe3ck/62s0knIBHJzmxpUAHnrKopEuKZwpJBBHq9JEeYVFP7NPOpt3q+bxEOhV3YbXlb6tT+PKKARk3rfrO1TZ9PaL6oYRQl8QSkcf3EvspdzcW83wo3Qr33VCxxj+mhoIIDVrS8IVUY6Q4qNDaJH4nSuLmd1ZZ7LPI/KnbvUjK6iIAEeDO9YyAUCve20FdnepoYItm5XhdX7TjviPxo3OzWujbszNh2dfhJv1iIX8XH4e5WqhYEu/TQ+NrNg2NlMPt6XYvu7yVnT1IA8QahyQvajqE0xvtVUiYmZNZ6HNrBZFBXrWyOvz3gyJB+Co6tGQCSPrzJqfKfOBIcjovWRe8IUoz5CulA0StJjrJkAUFL3bqqpZF6MzVcO1HIXwXB6mgj/awzg5mw/tdX8r/7vdKGhn8V5N9+SwS6DSzsDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5095791-213e-490e-900b-08d9d102a52b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:34.3215 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/Makefile, amr: Add missing amr-demuxers->rawdec.o dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nyGnOg33qTTv Forgotten in 1f447fd95463bbf39a78d886359a3006d82f6a94. Also only enable amr_probe() and amr_read_header() in case the AMR demuxer is enabled; this avoids having to add a rawdec.o dependency to the muxer. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 6 +++--- libavformat/amr.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index cc19325397..6bd8af1bca 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -88,10 +88,10 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_ALP_MUXER) += alp.o -OBJS-$(CONFIG_AMR_DEMUXER) += amr.o +OBJS-$(CONFIG_AMR_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o -OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o -OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o +OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o +OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMV_MUXER) += amvenc.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o diff --git a/libavformat/amr.c b/libavformat/amr.c index 0a044d69af..9250089cb1 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -66,6 +66,7 @@ static int amr_write_header(AVFormatContext *s) } #endif /* CONFIG_AMR_MUXER */ +#if CONFIG_AMR_DEMUXER static int amr_probe(const AVProbeData *p) { // Only check for "#!AMR" which could be amr-wb, amr-nb. @@ -140,7 +141,6 @@ static int amr_read_header(AVFormatContext *s) return 0; } -#if CONFIG_AMR_DEMUXER const AVInputFormat ff_amr_demuxer = { .name = "amr", .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), From patchwork Thu Jan 6 10:52:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535140iog; Thu, 6 Jan 2022 02:52:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzKVOvBVGtdWFIT8O1ekILCWdadEv4P9KCFGYl+IR73+5uUqbfUuom0VIuTK6rItA3Q9Ty X-Received: by 2002:a17:907:961c:: with SMTP id gb28mr45118072ejc.385.1641466378081; Thu, 06 Jan 2022 02:52:58 -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 v25si961171edd.190.2022.01.06.02.52.57; Thu, 06 Jan 2022 02:52:58 -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=@outlook.com header.s=selector1 header.b=QRsqeoac; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F313068ACF5; Thu, 6 Jan 2022 12:52:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17CD668AAE6 for ; Thu, 6 Jan 2022 12:52:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GaePIGXYw5uzi8nBgNj71DKb4FoT3MdyjTP3/K8a0mxRiCOc7FwApa/BDKN0JAARDqJv8oBmvKoWuxC3mGYrI4QY2nvUN9Fn8dIcjrdT7yNJHQh9ckDhM2MyJ3igJMhexZADsCcOKmQVTiM7dw+9FUrAhcVBrTU6Rb803Wc4e75jkh0SFuo90JkZOW4COgLT5nruLZy1e6RdT7EGb4F6tEqWFQzvZpmTSEDnLEUDWLwBtNu++vzhpgANL/6/jk1AV21FmXCnuk+0/DUjEYvdV8TlZ+zWYUof/PJwNjZDGvfktvbAN+DvMx76jyVycbjq4KvP+VSbfw/OapYzlYNgsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WiCKt8ydOrqPvSyyZ8mlnVyK3v318FV+D7dSCAnTNRE=; b=PXPR0G1whj/X1NYhyZc/vJDOAkilgBYIJhgVDtGRF436AjchUl4fmLd0iIfjnFXrk1I6H9M0zwui/rZ0odDlL0zE49/XuHRYs/uGYrNRAsKJ1TZnG/alPOFp2DLROt5GusAzve1SQJmaKYBxVC1vwqo/V6fQSZuZHmzdfoNTZa24h01nTsWIEqi29TBek/KHLO4e46TOe9h/hTyoikRIj40/42zu/EPXXibXliBlNqVj3qYQj07YCx3E65urF7IqVI7HHHX/8qBOmVUml946RH1FynIaUump8tGKLXA1LJFlj3CUZjuHyZdBbJ/Lzf8At83oKdBoYblZljKHp09idw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WiCKt8ydOrqPvSyyZ8mlnVyK3v318FV+D7dSCAnTNRE=; b=QRsqeoacmlmNc8MzvleX23r6//cxdasJrl976BvrZZYzAt6Gf2M96C3+mM2RnaeNPJQYA19w65T/J9ynUv2l0nLjjEt1kVobgy5Mh9MrBBFuKiIu4/B7IKQNf4lbPJBl5xNOb5X5zTZI8VTqiuieddvD/02cujqO43HMUW8B/D/nEKHOvVYBwuT7dGC6WtG6RpsEklFN0nLmpBdkTn+4f+MI+1Mnmur2SNvOxuAP75HkMxJb92h2yu9mFiV6qhNwpNdLsOFtJmyDR5l7zz7YRf99CwpEA24aiY9YF+SO/tcVcGRqh+vpio84k5uq86JbUaYHDmbIOjaqoandu4CTJg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [2aNPqv3BLX1S2n6nIT2HXQdbYiwTyMU2] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd17ac21-375e-4f6a-3fb9-08d9d102a67e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb2nWv53CVoeRcZZxd39mmNBSFvXIDbpvLT7gxLN/Zggd0Vz1zquO2dZ3coVV/9GyglFKXeCKnO9qDgu8KXI2A7RwZmJeZlABHd06KKmcsfAn7OQfsQ1llconOV8EggJMGSwK6FgVbCWcrBrnt7WCyWwEVgOyOoJ1UvHDTWqsm5uSmr66lcEf24o66RcxodrrmpDH1NajY52SL045PEhIFtVf6Gne8qkNn7z/Xj+9dc8d+cC4OUSeNlmiKLS7fv4qQAs7+SCJYQ1qu3fLFPbcjx2X8DrFeZomnyAdIXK9cWkK5PwpqLARNuBze7zUeA/c/QciHbKoVbKRekEJD1oCQeGGk6uB2ro9KQnoB7lUE39ZNjEkHrb6ioBgFvNfLme4RdHm92ASvB7uPiiA5B1ZkHXoKl2IetyoOdpyQe9vAzrfevGuS8XhByZdjyv3GAd6ND8VmZNWvB5LDiltQIso+h7twYZAy5s1wDeTjdlvqTkGRsQVAMTzs7rT2abo3S2EP3bu5cWK7nm/9Q5MoCVkVZAhenjJ0h5ZOLPd1iDWRVTmqMBmV7La5Mqh/9NkeS2EtOfY2UHW454Ld0uL48Z6vLceIksERy7NI68LTNHCFo3uoL0b4j4i1YoLegzN4QKr+9Q80OoRLgdbj5UGyvA2HKrFdrDuD8Rf63hGscO9P/Vj6Ftd6YClo+sGeo+zg7Ne8X17FJo724o2Dl9+NYDKD+7Yo6V91wZWxe/WEkZ/fS0Nu8D1SpcCZCbm44PMOfHIP X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p/1PAzG5EI0NoODtBdCpBrECbCGe/TMWHAMorvUOXC3gCKce2MDMVtOCboEilvIe4lyjd++HQgKeI4JiPgPITrxizPqM8qFPrWAeUjdH06UnVOxA9zjChpG90F+G6d18wc9UKHKQtDq4unDAUUJMEl1XJacd69fAVId9Gx73HqwTpH9SVMU+mcRZFQVh+BHauAIkHaGuWLDcSs4VxL5fVLgHZbZ6WTNt2XVB4k2lXMcs6uWHVAkFLQf3bJjkSAnzuMl+Fzd6tAhvb08dqNuDp0/fEDKQTgyo1tU06cEhKJXx5z5H6wkhf4mYXYaKZ+r4x5acoAXpz7/WmdT1slIylF2yonWITnQqnpubrhg8zjw8TkCxsJ4hipRi2rYBVLVuB3YXOf5NgxSgkYwrJkV9GYz5RpM+uIz/w7x+Fluzhc+ykWCTIAXXYf8GCf8gPSd2p3cjLbgzJfmdi64yNUH7uLwLMMAMDjRaMS0mV3rI4Jb0JlCstVGhflPvYtF8TrY4T0XJ2k2Jy1qz5kPIKABGqd/yKUQUyP/DJ6uQpTX3Z4h8DWeLZDLIF21cFqf29t4Ee3fN6FfZV0x6Mn2D67uuzg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Do+2kSWxHX7McYE5XFxckxrXlX95/uFKC3Q2DsfB0egGv9eaBa8ZPxfEqfrDQuLJgaGERub9FX0zr0wj5lJtq1X/g5DZ9DivCFKuR0/c+MsTCfnqna86V7dSKtbnM8Sl5pw8zhgBKT4e0oejPbOtYa8HXzYUFloOeiaFIJ601hnR5xtLfkbFJyVaf2YnGMhYRR3WVXv18wDV1WIU2hXFbyANL/6qGpCrP5jGsACk3ST4kStVhgxd2zUtYG1M/Mr69hRixkszAraiBdloi77jJHdiB5Uu7bXDedH5H0QCTEuy09e219+R8Tl7ia8WsGAGlfvzjkQx3FufAmRacsqs0Y2cNNFY6YjztAPi8uFGGvXeEfPbOHvwVx3YXshL70Fs5Pe9nln5zPEE7t6l4lzF/lN1wFw1bPtXnYfazdEgWA106ZJ0Q+8TbSpAeGsRyRW2v+fROTPeQUfMe1gJFgTuqN3kJrZPYDYXA1emSeMuvrMie6spqOcfC8Kt+k7QUD5QyYUVIM81CV+QUvFu1+2uZrnIihb8gE1cBtsVPDgCRP3f+ggqbD50s9lWD32t3CKCraLXO8bb1FcbrAiwns4qsYonvwOTCND0cjvi0P3/fkL84QVgwZeSaPGySU1qwGNkLmFhy/TMR9KhG5ON8pRdmawuPPrL0ZJ+bAnlvUPuB6Pan+8ajI3Sa8mJnyt8F/pk5ztsEnJwoVKGj4y28eWfDs5bISGgH0sax+wbo1LHSAmR2y6NvtKcjeLuyWHRc5Z6LsZfiKusNnRvYPjefsh76T890NYmIQISHFVK5vDjuZrgx18Aa0Udd5pQB7fEqEkJezOLp7bNB25PqD8A8uSzTICrlpPxEAP1sXxtXLz1BUr5QXgVn5h+6jTiyPihqmjGMXhlNUpYUqd6VLBRvc+1xdd4+YnQueuW1hkiYx3q8tTF+SmVnjm7xsVJlWDjmTYhkSoutsT/LiPaRn114qcVvg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd17ac21-375e-4f6a-3fb9-08d9d102a67e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:36.4942 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/amr: Don't reset AVFormatContext.priv_data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u4xVcwBSNb7w The AMR muxer doesn't have a private context, so it's priv_data will be NULL. If it weren't, simply setting it to NULL would lead to a memleak. Signed-off-by: Andreas Rheinhardt --- libavformat/amr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 9250089cb1..8e14052200 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -53,8 +53,6 @@ static int amr_write_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[0]->codecpar; - s->priv_data = NULL; - if (par->codec_id == AV_CODEC_ID_AMR_NB) { avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ } else if (par->codec_id == AV_CODEC_ID_AMR_WB) { From patchwork Thu Jan 6 10:52:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1535252iog; Thu, 6 Jan 2022 02:53:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx61G//qc7N/z38KoD9DOw028l11VLvJdElfKSRkBFonc1bmotSxPVPOPTMHtlIdIAm3pTB X-Received: by 2002:a17:907:7e95:: with SMTP id qb21mr48479755ejc.105.1641466387330; Thu, 06 Jan 2022 02:53:07 -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 dd13si839753ejc.974.2022.01.06.02.53.06; Thu, 06 Jan 2022 02:53:07 -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=@outlook.com header.s=selector1 header.b=SZqrcu8P; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17E9A68AD9E; Thu, 6 Jan 2022 12:52:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066068.outbound.protection.outlook.com [40.92.66.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 348BD68A255 for ; Thu, 6 Jan 2022 12:52:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTqIW6uxRgPCI0L0NY+4KsD1XNp1nHjgF9DreUL4NpGqpBlF3Wee6a4mAmj/jonWhRnIMqUsC3glcUxGYwKdwqGbyllfv90hc0WqVSjVOJkSXPbSjqsyqDpw5TnUHlSryzkrDe+4YQCpB/zhc1cHzt2IWk0gGAEXiMgb+twxDP65Cw/69hZFH/gKl+4k3voqgEljt/qgACF5XC8OWAIqhTkw5/yv6X5X/oni46hTfWtgD1lIZ5duHsKlyY2TiczKs0TZU5+FrSGMO36qN5trsJIv2R7Nqv8sz/4F4Q0I4sohkuHwewxW5qPfK0c9Up72dZXn+mK2D7T61UaVlx3RCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cvQoCQAzrExd55NQhCSrw5QuqDTuD9VpPC9JkwzjZ6Q=; b=J+v52Frkknih5+2gBiP8CHvolMS6J/cu/2FXsdQTgFCm/AEWwB9YT7ue88JX97VMpN6xvWnBe7bkI1X84/xYEP9etOx2qPG801U3S4pBG7iD+Jbkig/Gi3YaQgLG0XoIYQn9SDjox9TcSaYBEjEB7EcKcjr46YNEGh6fdXaRGyquIfWYY+8PTLSDKFIouTBfnrJfVNAcbSZioh8JzaAKSh9iC0gpWRDxMiDfr6zM1TqJeMNG+qi849qvXf3tgdHMYLOE+WalREVWlNhcMmq0wRxEqamb2wyyDGwUo7nIrvtfA719EB1C2WwVMt7Cuar65pAPVmG2jAGWN/s/TDrMNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cvQoCQAzrExd55NQhCSrw5QuqDTuD9VpPC9JkwzjZ6Q=; b=SZqrcu8P4s9/oZR2m5/GrHHUbUHHbhqpmxal6wLKxjDE1aC+5KgTWS48usO/PwHD1DvbquerPRfd/iD+h6DOTFnscHi+b3Zd4vLp5ezMQFODwpAhvhrmpuFs1tyr4NHp4YFCT6tKTr5HaXIFQf6/7ZNn10ifhEQ3DKSM7sZCDtTDnU/uiWmBaKnwlHvlVQstdVn+7kmReeY98+b+TW2pIz0sG+U/5ZMaD14NGZVVRDTiw/4MOWffZOtrFXTIQJLlJ7deFgTYrGuKj3oIkzjxQA9FasdsiEi+7MbhHGBOyjCfIbCIuM3iW/ELe0USN/4rOvkQN5QeAYlr9/Y1WTpikw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4294.eurprd03.prod.outlook.com (2603:10a6:20b:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 10:52:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:52:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 11:52:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ztaAhu5Vj7dtGk7ZE+v65ZNRvMFOPfL1] X-ClientProxiedBy: AM0PR03CA0106.eurprd03.prod.outlook.com (2603:10a6:208:69::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106105226.2200689-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b756a927-80c5-4868-ad3b-08d9d102a727 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ah58uf7i1ULckI48DL7wEXL7I7XwgkSGaOdqkyZZU5sZ61+rHEtrWoyxnvOZrnSLMH1JB9wXaW3ou4k7T82GdJXEcDbbEtSpoNxGGK0/Kjqii9SVNYAfn/+PyYQZDjDacY78w+wH+TCiiA2Y2r4/ar0ghcyAxh/ia/Tl0ckCzpsd7dDUZutSTxeMOL0x35q+goD2OUT9RS7wq7YD9gIFBerk9wiQ0Vn05G7UQ25kNh2b1nkKwzN8nKeOUmvJvrqZsfRORFd3S6uXDKo9fBOIUUHWwNG7aX2CF1Qkucl4G4ol9Ft6E9iFWyMOWa4qJi7hHCzU2Ao0surMjXA2C0eS5ChG3GI8C6WA383qw37Ocb9H+XwnFChr2Ha91igvP4cuE+PnFY53PPEgFm2ZTkoE5rRYwAFSMN7cifUQ2ZHn2sCFG6kSzY0Ek9e6Na5fKbhCnd67KHjd0hwdcjzfFoNBq+i/lkRSuun65AyEsMN+wG/2bcjZe/xzGt684uuiM5l5NAOtzj1HdlEDP3xAosWCzrmeb1IealMuoFqqRTCGq94f4MpgUfzGkwZUS3+C/R65zouxLWfTCIvHBVcgs12Zq8g4Hiyh5DC04feneDrl7cuWHjWY7ycfwAlQGumDYmoV8NEzJHETte3c7NFwKxjM1HXMQkAxyf/m++9sbj9sX9uhsiv6rdFMvsZw== X-MS-TrafficTypeDiagnostic: AM6PR03MB4294:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +T1CxvutoUi8q1qDlZZiSYpwve94eMtqzQUg/ruvTeHHGUtO3Wvryh062uGJO3N+LhT0EEcudq7qD5RadYxrL762TKL1dcyuwPW1E7P1uI8uoGZ7dsx0kKNCRadsjQjkO2p5bSZFUsE4rWnduicKPTinbv8F9R5WVSDt2yOnu781Ry6u7t3ur2pOA6wxNYKeDhj7//dIlN1+dfNXheB5BKOU/o3RyE+44XxiuWzu3g1wP230e0K15Itn3DglOx4JbJr3pjjE1YZWphCrJfBjeSlqYjJORNqcf0DyFfEYiQaH4PJxBFAfFl36DSZjTywLlnYO4LD4lRuEnIBQz2019GXkqrlwaOjD/tjLWcjotGFiHZ33/SS7pf103i6/AmC9j/Axz4xrja+y/GI0TMsAvcijKU86uXo1aCuSflpnvQsT0VGe0+t6Sg2aPGnDOChzOWMpM4ZoS1XhB57lAi2jaF1lrkJ8tEzmqAlAxJp4z6ITaJ/T1fwyH2scyGbawWdYHFpCuxSk2yROPlBkhHrxg87bW4/H885i1bsdeq1aOOBqsKJSfAuTdV35kX51pMBDtvzDn+KS1OE0gSd5thFgIA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3/k2Rnw/xP5QqO9ezmqHI6EtZa7QrZaFNrY3XtrD7RP36OwfSMP5QiEFyR3WCrf0GqQ9dvAviSSWLt8sv/bnnbMiHCJL1vMtmJbfScyDUynUehhS/TZcw/jnayEClApzs8amFJ8WmhA9uHWSdbk9HyAtWtiHBn2Gj/6EYmZcUfG9JPvOWHUZrCINZdsuoAXnWwFVEAI06uv6GtLgA4xv8QusVg2wQN9ah/ZV+GPYm1IRV2LwTCSiq9htyfFn9GQEo6EWohlHrf7jbpPpNphLyjPbN/UTLUfDAk5I+zqBDG9rQKdZDgZgJrsRd7BfHDjDTsYo3fynBu+3G1+j1mMncDtrM2wgq4gYMNmypoqjKeKIG1BePmCRjSAgn4U7N0vumdC6UwpvWzaGENLehIkoSxIOF1si5BWodDF9tGB3NMA+2kNX8DjkeDEwPKeQw8EZMpEOUycRGJu4jZPquSlHwmku0BCCVYyJPtScLfJ2muDosKIGt6DACvZELy/SQ+MuAencuuC8m/Cqm/f3PGPE5+ieay4x/Xvh4A/ZjEFMIHR5NWrzO/dOF3iS3zi/geFAZFdE40H0rXserYMc9yQTkYkHOT01oT8Yzs94P7bKm7mE/Ov7C7McQeFahgWRPEXC2xhopCncZ79LMppQt+nPDRcuzaMkTf3bOgq1c15YUQFI1fI+47xoxE0jkijD8taHyRTFLs0w2cXkYJrCRu5HPrZQ9fL8rZ9nGspFoL4r0qOn8/DTvHRZOvwCXJVi79qqDHSDDanmKOTGWM0AUpYEYV+ba1DlVUszDJoq+St+svV+KZiBuL9oCQo+rklz7sheX1uSegv7OCvLbrIOGLgoZTwXss205YsVTZW1V0t7XJ6oTMasRtEoZdos6gHT8pXZGRtcgDdvfWSrUYLiboqh/xN9n9qpXaLzwMJqTQvZ0/ZL0ImwjdC1rkCkJl1wEbF5+2+8QoDT2Hmb0gD7xy0CyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b756a927-80c5-4868-ad3b-08d9d102a727 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:52:37.6201 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4294 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/amr: Fix writing AMR header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pOj52Z9c4ZGe Regression since f282c34c009e3653ec160c3880e64fc1a9300d0e. Signed-off-by: Andreas Rheinhardt --- Will add FATE-remux tests for the muxer later. libavformat/amr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 8e14052200..40d5bc9cc5 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -54,9 +54,9 @@ static int amr_write_header(AVFormatContext *s) AVCodecParameters *par = s->streams[0]->codecpar; if (par->codec_id == AV_CODEC_ID_AMR_NB) { - avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ + avio_write(pb, AMR_header, sizeof(AMR_header)); /* magic number */ } else if (par->codec_id == AV_CODEC_ID_AMR_WB) { - avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */ + avio_write(pb, AMRWB_header, sizeof(AMRWB_header)); /* magic number */ } else { return -1; } From patchwork Thu Jan 6 12:07:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33116 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1589504iog; Thu, 6 Jan 2022 04:07:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLy0bsucoHS/FyTGHxq5DebVYEuIpRbqGu7RxUZZgj3A/3xqBJ1hiNYNHN4vtdYsYbnk86 X-Received: by 2002:a05:6402:2891:: with SMTP id eg17mr57903184edb.33.1641470849303; Thu, 06 Jan 2022 04:07:29 -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 j10si997536edv.606.2022.01.06.04.07.28; Thu, 06 Jan 2022 04:07:29 -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=@outlook.com header.s=selector1 header.b=kHd7LK6l; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C777268AACC; Thu, 6 Jan 2022 14:07:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070094.outbound.protection.outlook.com [40.92.70.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E91068A255 for ; Thu, 6 Jan 2022 14:07:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aaxN3Cc9PZgtIdBN2fvebWgAKBQKKYtZbAy0umpRZWv0RhA1vqcSsAPjAck9HpU0OgVyyan1aqTOVzo5ZudaArwDuaM+tZjv5+fszywOg9riymCmsyHmcmnJ+rFtJEA5IJGV/YoGorWHLnNn23BHOleZ+xjJ7bx7vpRUlfGursuriz04x254/uPw7h/wOL++/QiL2+5kqj99N4QDjujSOZmNMjZjTTayKc0LjKM8kG2FeF5gUKsrpLu63p7vfrNLy8PQ6YplXxnZKZSmrKQCi9jerPNYv94vr/9Oyldqty1hE+I/rq28q71vbXn8jWkDy4NbQEfP/lFTyJuDrpZ/xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Gotyp+842fHkbwTlTW6s2PP+CRkNlabZA0t0k8MQaog=; b=Wz8G1tgd88eYMIq7JvMIo51av35BiCnAcOYMHAxEpOcYiSI0f+1b3Q93yM4kU+45g0er/OSyfxdUeZrjzxu965/0tqE9BYZbSDqF3J2NWs7jQiOZy6gIDLz93elva9NgeeroxjafoQ+7Qi+MfcXXwBOBWxcpUeFtCRgFZ5HDxwHOoGl4AkGLtaWyTOn8fP1nweHtYbzuckNIlQTbTV36GFRwBPSgdksPKt7J4ZcL84IBsJVX5Z8mVKNWCTQktQ7wNoIxh4yaQqy/rXpWU3zXMoIDc4ETo7nlTsR1QsJ8SmqjFpPUZsqFkEcLraG4nL7SVpLUe4g4IuETyaHdkvyztA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Gotyp+842fHkbwTlTW6s2PP+CRkNlabZA0t0k8MQaog=; b=kHd7LK6lcC+1xoo2gpVyjZpdI3deyR0FdxLBVSP0vFyyaJwsBwxHL0SVCkLCImZtuEgvGgbLEITK4SoeueciBxKA6vtUQw6/9+RrAes27Ec0hd6V49T2mKMrWPkAqBCt+mSUiwJcb9IvJuYAaP3TO55cS2JnaOteolMpfBPB3H+X+Njm384uK7AHePSZYcx/zTQd9FBnUUdNOUv2jrHsHJ7L4lVDL9XeblYdruvx1rA7RwbE+ajEYmyU6t2Ya3SqzNC3a5ToiWWIvPDUcZswz+Ej8UMwjF5PHoCmn/Ep0ij9nMMGmYtOiI/6sBDrPnOE1nweMaFBCLliRrNlwhFMYA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 12:07:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 12:07:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 13:07:09 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [D3sFM9edrhcQG5wiESd/yQBMs6Nzsj0t] X-ClientProxiedBy: AM3PR04CA0129.eurprd04.prod.outlook.com (2603:10a6:207::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106120710.2921122-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b3f36cc-fd08-423d-bcc4-08d9d10d1557 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlWjwktUE4Ei93sSFDJm6o5Ca7KcqoSYUyfOWD4JM6RXC1PZLOVGF5OBF5Me7u3/Bwzyj5rzfthJQJ8hXIpb/uEhcIyKdEA8gBIxQOfDDR4quQbshNfwe3DSADKsejZiSB1xyP08jczAPalASJHxXBRoD+OhlO0igFbZiUWY56IRfLi7Xpf+P0GcoQRvYRskrPuGl+5fc05+2T2YQNPjSrBvYSw6ab9rJIt1h0UB4DnJ+5hjeWtylniX1l6o8Y86qogiWtaWRSpkn0u7vfOCBknO/Q0FgV38PlLm5tkmSWnfzKDNuVTQ6lP0GJ/8E8jDzevqqnDsvli77eSnkDUtn/QPz/fwT6Jk4NtolVX7Dr3JeI+HXPBEowZ7itHjgyHCcZQojSI5Yhrp6CEJvU7tst4yWDO7F1jIVchSaA5XvGNNudAHTuV+KSuRNwUuIZk+Zl7ytH6qQiDWeXnbolsCLMKKN4BazrCQzJG5o5dtXvWXvszqU2uhxwcuG6oO2imwdTAxikjZvbKzjIoIlYGi/Seat2VCxQDpYjvGJg+nfZLUB06GrVEZ6VOQ4Q90CAyWyD1JHoUEV5YGW2+F89RkHmFifRlY1GR8b9yEOyau80q/cm7m4vRmLpF5koBpMyufTMDfIHPXqtj9JDlQnDr6CPOC0jFMdt3tX4R1Lc4YjMZTIDTWIIApGRORW9OUkyqcSpWy6OZsWHfBM= X-MS-TrafficTypeDiagnostic: AM7PR03MB6532:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hAuaJdIYgDS+OOvxl86eP5Qx4fec6LMinDAYoY8EVs0Ph+aeMix6CIcym1WoydILeJiM8I2KsNkCSgQNrk1H3IMq36eLuTRMF+kaqUB6oqmZDWd0JOKpzR0ckPu5V1bTfkvRkel3xTxLY6FpYDQxDJ2zZR0FvKVQojzsHdzA5Cx8xglIK0j3c0K0kY2AL4xc4PlseV3s2ftFHKgYQwF/oiecoaHFBE5wLUpOK2FykRTY7cEi9525WOMBisOryBPCkWNxQc4XFvqDJ95fZN89GcNUSsIyCT4XwB2aZZiWu0XZKk3wTwpqTGqe4Yzr1Uwx/2yWTPzQq9Co5Cm2ivgKC4tmvbcwEnCsFyqc5wkVpBrSauu7FE1jHfFcHFGgA6xl6C8x7hHjKAIQvKCH27JhuGVflXmkmKp3z68IAJhpye0AHfOv22rufZDVOLnzxq2aGCvM5TpdJA/FdVphzAV+u4l411kYXM3oKeACDuarxhNtFwcN2+tuBB3gnGmKpBSIqiq1bisb7N6pWxDs3Ynbf73sVzfTSHKdUicOc56cu2Z8lcCQkZn+2KlgqTDc6ftJw/eT/ZWxqE0zng5FVH+mgA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zBGE1EmLNZFeKfISPw8nixX4RuDCuw2BNw81vkAKj93vMzOXSyPBVYgn3GQvE8NaWGkWHrotLjd6deS1jUZ5so6AuAa1ReRyOEPWF1zLVf1JOic9pw59yUdyLbKjtS8rvDQk5dZ0bBlrWg/LA4dpZ/vZUzzzscQCZA2J0LPckAP4ykLudk5UrvrNBTSMzFjYUjDLJ7VFyj5Jrkauq4eau3L7jnIA7mTzRD2zzd9/ISFDTVwuGvbiLOsWTIi3cOBrSCeBQkU4bFiEwXUMTTOfjQ3LCh9pzlKzvFtE0pPoEhTBlBwL1i/hXbZymlUfUHudUlnS8IZ3lPwEXLTg0BCJPrjuId82qPqh3XWEtNo1IeIGye18eRC4VekZDdRUkF0yYZEc7qdisjPnrTpFxDbJUlzRyvsKGYApsHmaRP2B36VpYBkimUq90HSrz/Mc+6woTov/EE1zEeoqqv5RC9WeZyusq0NiJW9adAgpqdyVoaRSOjRmsajNQXsY8nowaAl3zAD/5is+ifpfNpz/CcC2387vA2Y5wactBIj+lPD8DR69VU9kgv9XhTMrJdnT573da/Ius2gmSB9SQ+6AmeUn+BndcUgsfxGSsoVzTOJi6QHFCAI3BcoAj32tzr7H/ZCUmqqR8CdM9gBpjbVOKXIAp/8H3vAkCBn3UevKkn7kskiF3HxZqhTu6VX8APkKLnOpykeevIR0tHhs7J+cCSLr4VWsCaErfQXTUEPNOLLMX68A7rA14xHcr/tnevFknJNuW+Pn59pWdLBW1yREmoaSf8X1Q98qbIgwAL02B8i6ZM014pwdUCQnDMgUzIxMJowt/2ueqd2kOywyD4IwlPp50bXOj7IwLlxKSBA20daEox3xAv/NDDYCh+SATd+0GcH7PdZ1OzLzc5S8PFa6+Dnjmas2rPYKhFcgg6BH/lN9ryjDxkgg6HhgzUCKbwmeb0TC6yoyS0jOe6N0jPtBvhGO+g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b3f36cc-fd08-423d-bcc4-08d9d10d1557 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 12:07:17.4986 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 5/6] fate/amr[nw]b: Add remux tests X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bvLT4lVmq1m2 Signed-off-by: Andreas Rheinhardt --- tests/fate/amrnb.mak | 8 +++++- tests/fate/amrwb.mak | 8 +++++- tests/ref/fate/amrnb-remux | 58 ++++++++++++++++++++++++++++++++++++++ tests/ref/fate/amrwb-remux | 58 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/amrnb-remux create mode 100644 tests/ref/fate/amrwb-remux diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak index c0feec25dc..f4f74f14d9 100644 --- a/tests/fate/amrnb.mak +++ b/tests/fate/amrnb.mak @@ -30,7 +30,13 @@ FATE_AMRNB += fate-amrnb-12k2 fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm +FATE_AMRNB_REMUX-$(call ALLYES, FILE_PROTOCOL AMR_DEMUXER AMR_PARSER \ + AMR_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-amrnb-remux +fate-amrnb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/10.2k.amr amr "-c copy" "-c copy -t 1" + $(FATE_AMRNB): CMP = stddev FATE_SAMPLES_AVCONV-$(call DEMDEC, AMR, AMRNB) += $(FATE_AMRNB) -fate-amrnb: $(FATE_AMRNB) +FATE_SAMPLES_FFMPEG += $(FATE_AMRNB_REMUX-yes) +fate-amrnb: $(FATE_AMRNB) $(FATE_AMRNB_REMUX-yes) diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index b93835d76d..617cefca00 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -41,7 +41,13 @@ FATE_AMRWB += fate-amrwb-23k85-2 fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm +FATE_AMRWB_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER AMR_PARSER AMR_MUXER \ + AMR_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-amrwb-remux +fate-amrwb-remux: CMD = transcode mov $(TARGET_SAMPLES)/amrwb/seed-23k85.awb amr "-c copy" "-c copy -t 1" + $(FATE_AMRWB): CMP = stddev FATE_SAMPLES_AVCONV-$(call DEMDEC, AMR, AMRWB) += $(FATE_AMRWB) -fate-amrwb: $(FATE_AMRWB) +FATE_SAMPLES_FFMPEG += $(FATE_AMRWB_REMUX-yes) +fate-amrwb: $(FATE_AMRWB) $(FATE_AMRWB_REMUX-yes) diff --git a/tests/ref/fate/amrnb-remux b/tests/ref/fate/amrnb-remux new file mode 100644 index 0000000000..4a78c479f2 --- /dev/null +++ b/tests/ref/fate/amrnb-remux @@ -0,0 +1,58 @@ +55311d26f9bb6faa36d99ee7cd34ee05 *tests/data/fate/amrnb-remux.amr +7674 tests/data/fate/amrnb-remux.amr +#tb 0: 1/8000 +#media_type 0: audio +#codec_id 0: amr_nb +#sample_rate 0: 8000 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, 0, 0, 160, 27, 0xc9970c51 +0, 160, 160, 160, 27, 0xbaa00d05 +0, 320, 320, 160, 27, 0xa8af0d60 +0, 480, 480, 160, 27, 0xb6750d9f +0, 640, 640, 160, 27, 0xcd7d0e5f +0, 800, 800, 160, 27, 0xaf740d0f +0, 960, 960, 160, 27, 0xcb1c0f93 +0, 1120, 1120, 160, 27, 0xccfd0e02 +0, 1280, 1280, 160, 27, 0xb3e60d1e +0, 1440, 1440, 160, 27, 0xbe510d70 +0, 1600, 1600, 160, 27, 0xbeb30d65 +0, 1760, 1760, 160, 27, 0xd4730f2b +0, 1920, 1920, 160, 27, 0xa8540cd0 +0, 2080, 2080, 160, 27, 0xafdb0c14 +0, 2240, 2240, 160, 27, 0xd9930f24 +0, 2400, 2400, 160, 27, 0xbe5f0cec +0, 2560, 2560, 160, 27, 0xb44b0c6d +0, 2720, 2720, 160, 27, 0xdc160ec9 +0, 2880, 2880, 160, 27, 0xb8a20ce3 +0, 3040, 3040, 160, 27, 0xb9120c90 +0, 3200, 3200, 160, 27, 0xcdc70e7f +0, 3360, 3360, 160, 27, 0xc7c20f06 +0, 3520, 3520, 160, 27, 0xda530f0e +0, 3680, 3680, 160, 27, 0x90750abc +0, 3840, 3840, 160, 27, 0xa4840b6d +0, 4000, 4000, 160, 27, 0x96ed0ad1 +0, 4160, 4160, 160, 27, 0xb6b30c26 +0, 4320, 4320, 160, 27, 0x786909ce +0, 4480, 4480, 160, 27, 0xa4ae0c7d +0, 4640, 4640, 160, 27, 0x9ff90ba2 +0, 4800, 4800, 160, 27, 0x914c0c22 +0, 4960, 4960, 160, 27, 0xa8df0c9c +0, 5120, 5120, 160, 27, 0xb67f0d8e +0, 5280, 5280, 160, 27, 0xb6810cca +0, 5440, 5440, 160, 27, 0xa6110c80 +0, 5600, 5600, 160, 27, 0xda0f0ecf +0, 5760, 5760, 160, 27, 0xd6270e0d +0, 5920, 5920, 160, 27, 0xd2150ffc +0, 6080, 6080, 160, 27, 0xbd010da4 +0, 6240, 6240, 160, 27, 0xb9eb0e46 +0, 6400, 6400, 160, 27, 0xc8a80eb6 +0, 6560, 6560, 160, 27, 0xcc6b0cec +0, 6720, 6720, 160, 27, 0xab190db0 +0, 6880, 6880, 160, 27, 0xb3f90ca7 +0, 7040, 7040, 160, 27, 0xa84a0cc9 +0, 7200, 7200, 160, 27, 0xcdca0e8d +0, 7360, 7360, 160, 27, 0xaf8b0d1c +0, 7520, 7520, 160, 27, 0xd9980e15 +0, 7680, 7680, 160, 27, 0xcf810f8e +0, 7840, 7840, 160, 27, 0xb7810bd0 diff --git a/tests/ref/fate/amrwb-remux b/tests/ref/fate/amrwb-remux new file mode 100644 index 0000000000..c350fc0b61 --- /dev/null +++ b/tests/ref/fate/amrwb-remux @@ -0,0 +1,58 @@ +3634e03f106db1da796059bde3258efc *tests/data/fate/amrwb-remux.amr +31241 tests/data/fate/amrwb-remux.amr +#tb 0: 1/16000 +#media_type 0: audio +#codec_id 0: amr_wb +#sample_rate 0: 16000 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, 0, 0, 320, 61, 0xc8891fe9 +0, 320, 320, 320, 61, 0xc2562027 +0, 640, 640, 320, 61, 0xe46e207f +0, 960, 960, 320, 61, 0xa27a1c46 +0, 1280, 1280, 320, 61, 0xf1d42007 +0, 1600, 1600, 320, 61, 0x50d61af4 +0, 1920, 1920, 320, 61, 0xbacf1eef +0, 2240, 2240, 320, 61, 0xbd691d7b +0, 2560, 2560, 320, 61, 0xfd1323a2 +0, 2880, 2880, 320, 61, 0x7ca01f0e +0, 3200, 3200, 320, 61, 0x2f812276 +0, 3520, 3520, 320, 61, 0xaef41ca8 +0, 3840, 3840, 320, 61, 0x2560211f +0, 4160, 4160, 320, 61, 0xd6ad1fd4 +0, 4480, 4480, 320, 61, 0x87d81d18 +0, 4800, 4800, 320, 61, 0x11531a44 +0, 5120, 5120, 320, 61, 0x83011d4f +0, 5440, 5440, 320, 61, 0xca39211f +0, 5760, 5760, 320, 61, 0xa0031e8d +0, 6080, 6080, 320, 61, 0x0b8a1980 +0, 6400, 6400, 320, 61, 0xd2931e62 +0, 6720, 6720, 320, 61, 0x0f7820fd +0, 7040, 7040, 320, 61, 0xcc8c2149 +0, 7360, 7360, 320, 61, 0x29f82236 +0, 7680, 7680, 320, 61, 0xf7a71f9c +0, 8000, 8000, 320, 61, 0xa64f1cba +0, 8320, 8320, 320, 61, 0x685321c1 +0, 8640, 8640, 320, 61, 0x48002221 +0, 8960, 8960, 320, 61, 0xef0a1f53 +0, 9280, 9280, 320, 61, 0x31e321a0 +0, 9600, 9600, 320, 61, 0xb49f1ead +0, 9920, 9920, 320, 61, 0xe5bb1f9d +0, 10240, 10240, 320, 61, 0xc5971d19 +0, 10560, 10560, 320, 61, 0x33182328 +0, 10880, 10880, 320, 61, 0xb791204e +0, 11200, 11200, 320, 61, 0x5db81bd8 +0, 11520, 11520, 320, 61, 0x9f171da7 +0, 11840, 11840, 320, 61, 0xec4a1974 +0, 12160, 12160, 320, 61, 0x980620e1 +0, 12480, 12480, 320, 61, 0x74cf1d0c +0, 12800, 12800, 320, 61, 0xea761ef7 +0, 13120, 13120, 320, 61, 0xa1da1cc7 +0, 13440, 13440, 320, 61, 0x68741b28 +0, 13760, 13760, 320, 61, 0x87991cee +0, 14080, 14080, 320, 61, 0x955f1d0f +0, 14400, 14400, 320, 61, 0x8eea1e69 +0, 14720, 14720, 320, 61, 0xadb21ede +0, 15040, 15040, 320, 61, 0xace61e29 +0, 15360, 15360, 320, 61, 0x67441c17 +0, 15680, 15680, 320, 61, 0x7f1b1e7c From patchwork Thu Jan 6 12:07:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33117 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1589642iog; Thu, 6 Jan 2022 04:07:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfCINMVTSdNvMOoNyWD3/2mWttrIlc2yG1LJqhpmPBlaiNs/XDrLUPpglvMv+bAEVw7vDp X-Received: by 2002:a17:906:f214:: with SMTP id gt20mr567866ejb.458.1641470858529; Thu, 06 Jan 2022 04:07:38 -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 js4si933951ejc.181.2022.01.06.04.07.38; Thu, 06 Jan 2022 04:07:38 -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=@outlook.com header.s=selector1 header.b="S0Xa4JH/"; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3B1F68ACF5; Thu, 6 Jan 2022 14:07:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070094.outbound.protection.outlook.com [40.92.70.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C1EA68A9AD for ; Thu, 6 Jan 2022 14:07:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JxUzTNe/2IBFSynMvh0Z6htqhxDUCIbdPw1oPTiKfrKPIG0/LgfjxMiSY+4/7PabGFEncs/UXn8+oA/ImhASlVHw77mfJ0JTlhU9Tc/MXFvEPpLHZYz67zEpTGFEeeO5mw6vgYROt9D31GNFqmZUAzOBA2unXBjzRC5NpOGD/fn83GTN35Uy1kotSApfSW+7bE9w7SGpoG9YqTrtWux2rGy1rJfybzq46a5o4MalVCBPO9COCgZPma+0BaycFnORQYKfKktwjDkjriwXee5CktlUqNjd0mAGOif2ejxQXIen2znI3XqtmSIcVvlmxvO9/KszJrWjbyPOqqSPz8mlPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=69hd0uoZqKYyTCJnQfqZWEJG/wE02AZdllcnqgXFONU=; b=YAeQFHwY10FK3CjTeHp0gF/0/2/EVqdl8F9LioKqVSmz7XiVwLX+QNqjWeUVlJn9AtufEVCcPExOKvXYr5Azt5ZzAMNOr3Q6ylH8oY6fRNWtp4XijZ+PuqRfxU6zDIg01GNLRMqutCWzapQZOhs5KaqmEc5HjGiu0BNvUrDKa4hgDR1vgO9ZuSXhQ6pYGXaSlYa6M3tjoZOXNrX2KxC+7zr/Z62Ec0PcOLlTLUSmMk0/aFDS5tod1S1wUKuLJkQIJ8p6Y1m1P4UqF2qnG7hHsrKKgqy9l8TyRXW2SKS3A/hEmleWa9cw5aDLE8EgGUXD6mkpNCJyi/elEesqw8cL1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=69hd0uoZqKYyTCJnQfqZWEJG/wE02AZdllcnqgXFONU=; b=S0Xa4JH/b3jBj+UxFGzl4XrqB4FyXOgD7C3c1SnM1U3n8hgCUKxnjt2DB1HVN93erXjvNlJwTz1+XlinEACU2A90dPNYliJeqAYMdt3sqbRT4kRk/EJ8/aOz/zpNgciMfmXGs6w3q9Qu38XG1CId8d3tysZbLqoqkyFWeBYVCIYBJylbMJiXE9OnogeqV3RE9OEiVb8k4lpel/BxGunNXJH68WThPz27d6K8EKIl26hit+cHvjgDn2tzA3htuzt81Zi3VJf9DlUEVsMVUFMjlcGGRvt15LJ/Og53sfcHy5w9yEztO41GPCTjR5fivOn3n0KIpGo0KO4znu0vTzIxgw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 12:07:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 12:07:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 13:07:10 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3YiDs6gMIsg++BOXCDl2xeFnJKykvvhl] X-ClientProxiedBy: AM3PR04CA0129.eurprd04.prod.outlook.com (2603:10a6:207::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106120710.2921122-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e147a3b3-0500-4469-8bfb-08d9d10d1772 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlPAwEqFFszUaCE+1soOYBHy+I9+hs4aMiCqogAXN7Bq2xELKNrNDecD9NIUo8IEUFDo5iGR807/6c0FWEhLpOhVfnd8QS/nbX/hEs7w8wipfF/DYc/bFyRZKHOPHj5JfPJ2WpTOax3emcOHsN3lICWgHQqtp4fEeAgWuMjwV41pnVjT6GDcHnQIzcHxkHoQLsKDp0CFQg1ty4i19dh3gDM2d4vioWzxP4nl/uHdvp3/pIxXwaYmM3hR6CArUmMeuG37mOKKt75f8oG09MnwpBW3QeuoC44PYPs+YeO93PWIGiPS4NwJSATFVD0/XY4DnOM7yYhgQsjmui86Qdjurukuo3/DhpoTpbAwHRxZgsUft+reaTqVDmS8OugKJfpruGmCqr6EygUgUgvtvBGVSAxrFPwV/N20iQed9g7qqCeF6Wqri8iMvBSUK+8gA1wHFfA6HX6EagRo4XupBvOUPXVhqjbqaNRcelT8/1bG7ocjFrmYmKz+TAihvPEbwbxal/DbsiZX7VEz8FoKeypg+EljzdGUoyxLH7ROs+pvLMxbsIK1c/3YByWrBKobtOqYrhqwTCNVqd3BjnffxjEIHuw/X8Y/H+0MvkGQ0Jj37McU9geOXKPucsWBnubz8L6EdGhKRB+oHWhDDZuJ3Kc71heYFfPRIEDCOuFAoIoNyK05NKpzDCo5vBEQ/XUVKJaqOzIwR1aSDNw1Q= X-MS-TrafficTypeDiagnostic: AM7PR03MB6532:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRCAIMRk9RmU18RRsy31NpYaLVM8zZ7iC5gQiFlOqtV7LITNTY2cbB/LAoocgw7suiJoGoz4MaqENstau3I2CaI0N5iYReZTlbSolDnEKyERYihSbHP3pM4aG3cknNz6+rDlmEr9X5S5dOlKssuJ13s54PQq3igun7cAoLyB1kA8HHRYYnQwL70ZxmJYEdc1oTLaIWvvgNCFn8NVnIQVbp5vNOhAoejvXFuSWrduW5t6+64j5HJzZN4DhVNH7Vqz6EH/RzklxSOnRxwAfIKlTCQOnvbTfbB/v7DcVvfJSKQxBsC90GmosBmsVoyXUXdrJVDG131uXLXIy1DXpZjrnPxqtbE3TPducR5jnHqWewBXMKfXiToNwtNXU8wXbUgT3c5UPy3EbIPcNdGznUz22Dwfdk+rqYijNDMU99YflOp92zRNcJoVsm8MWPd1/vZpxpKvU7CRYGA5mx/E/oKc16OTlrkXhM1Z+u60E1PNYJu9CNh03L6X9FXsb9EPw2vij/Q3P2hy7qJLgeBu34f+nyYDcmaPB33moUCh4la0MdOqous/fovsithjy3jQek86qU7c924Ye8gYL7UZkR9OjA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MiZMkqpvGv2d3rA4B0z6ZNEFoi/qiw7Uoju341uSDbHiFP6QPsvXdnj22KZUd3K0/RXbcSI1GBEBGRo3NFRHp9Tq2MDtfMiilCZV3XKbXEY2jKemSA67k8oMejdj6iOqXGAoI5u5aXP5ZODVXsRzbgDTCmqlJt8969+rY8/dTKXcIEjjuAYfdKleYGoRyBmO+jDPTo7KDJrqbvc1vQfjHl8j8zKEDQY/MqY2o5/i+VoCwMK8PBxpr2Zov4VBF4kMvNK4pYQpU981nQVqQIrTPn0GQ2aC+Vbv9HNXy8JykyGssS+V2QuLpbs08eAESMgraVX/+dudmJE/NtRPD7q2QsRQrxYl5IZbhXKDCaFEOesFdT4jUtOjVudtrlL5mCcSYoHiEHJBvWokCyBjhbsFWrjRsLxcQGEvxhlFv+O/1PXc2OIwceqlUvMxZPDYgbCloo6DdTmRunuP6Orfo01KyLNiwJ/6L3ES3xO6E3QwOjCXZ0tQfqvQeU12UvImh0hFrYrlLDgc+axuE82xKWbtBlf/qCexQmOEpX8BMvqbTPpq1Vyz3PSGMFQDLdfDbZm9RUjn68uRKybyYfxdPqVGFczVsoSAvm3WGPiHltfTeC7AWxqR7BQVuuc2OXFJQHmarjZo3chMBHe2tnB6QgNFtyxleZCpf4N3K0F8vpDwim/2Ya13ZkaXbCzzmQPD88q/oaSmdZPqGFKqdwNX0DpBdEqY7i21u9zLxaV2ybukjgLirHXK1vI4g1G1W3QpIcJVVIp4CAp5ryXkDWT5X4BJdmC6jo0TPr/mYQ61BytGcmnzs8V54HRFencQmO/38rKr1tVOxckhRr2QFzuccAdlYKMZU1rlWUxdkyCTKT0Q8c5ylCHCeGFSEITLBF0KLKLhWEBRzFOBVIMiCxDpWfMqLjSVtzknV65G2mVNINkZh8du2z6XnGF0ZON6WGaO4e5t3IgFMrsD3QAWf6WNjAF9Pw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e147a3b3-0500-4469-8bfb-08d9d10d1772 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 12:07:20.9997 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 6/6] fate/amrwb: Fix container type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R+5SlUfBKRaf All the AMRWB samples are in a mov container. Also use FATE_SAMPLES_FFMPEG instead of FATE_SAMPLES_AVCONV. Signed-off-by: Andreas Rheinhardt --- tests/fate/amrwb.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak index 617cefca00..8450c28bba 100644 --- a/tests/fate/amrwb.mak +++ b/tests/fate/amrwb.mak @@ -48,6 +48,6 @@ fate-amrwb-remux: CMD = transcode mov $(TARGET_SAMPLES)/amrwb/seed-23k85.awb amr $(FATE_AMRWB): CMP = stddev -FATE_SAMPLES_AVCONV-$(call DEMDEC, AMR, AMRWB) += $(FATE_AMRWB) +FATE_SAMPLES_FFMPEG-$(call DEMDEC, MOV, AMRWB) += $(FATE_AMRWB) FATE_SAMPLES_FFMPEG += $(FATE_AMRWB_REMUX-yes) fate-amrwb: $(FATE_AMRWB) $(FATE_AMRWB_REMUX-yes) From patchwork Thu Jan 6 17:15:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33127 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1836242iog; Thu, 6 Jan 2022 09:15:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaVlaUjeqnddLr2YDOEj09WhaREnCu2Knz+6VolUhz65NlBEDdT5YkM3Pt48HAQTJG/MbU X-Received: by 2002:aa7:c5ca:: with SMTP id h10mr57631537eds.401.1641489356703; Thu, 06 Jan 2022 09:15:56 -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 x9si1336066eje.729.2022.01.06.09.15.55; Thu, 06 Jan 2022 09:15:56 -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=@outlook.com header.s=selector1 header.b=c5MPDZsu; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3709968A841; Thu, 6 Jan 2022 19:15:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D7D7689A52 for ; Thu, 6 Jan 2022 19:15:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VDuKftdHVjU22lJ+e1E/bFLKeXIEySth38rPVdGXdkPFzGBsL4EFkgducpYf1PDTI2SnftA5YsftOcrxxeztMSxxZSRJKs63kTb2NOAZydYt4Fui2i3okwavSvLGYyqld8FCJbgEcxSwdxgoTybM8ATBD+oAKgTyh89y7C/RLp/am6N+MqgmoX96Ch+R2D14MtOsXfYYcw5eDj1SeWwg3Zu3WyUDvDRixWTxOhXsmTYsJVNpr+MNRaseiralWB+thBAuivamm59WbP3emPjZNpmlxzjgLRY+tVT6tguGV7FwqlcMjyGaJSd6Hl2tSTR+nw41wOQSLEyjgy6/nXqyBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vw6VtlMgN0ZK/4nM+jSNsnKfa+8ydjHTekMmp+AsFa4=; b=W8iq7XK6mZN9qfe7RMyjE5nyvz2aF0RfZw6F6gtyD6TlVzNRbALkWcf/yHUYU9li/vvVTI50PJRhN9QuZ38enCd0/U73i+7MOQYPHmisiZ6p3nA+SmZGaLa/U1G1u9/eD6PLhfMds2F8PH9P4bhJSMtDr6NB27/HAr1x7PFMLFKBF4UyOoYays28bUxcTIzqkOcuHVMFVLRX9FHBBO9vmVrrDO9O+FSRtZey6Pz5xox4RHmgZn3KaxrHR2yuJGAEG44I2dvC2QxqRMQu4LTsrKmneSjBqpsR2kR9htCzEZNLL91tAvpRPkMeEhUYzfFDUgkcBJRxhrDnPuzT3goeAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vw6VtlMgN0ZK/4nM+jSNsnKfa+8ydjHTekMmp+AsFa4=; b=c5MPDZsu/2BDhWqyMhfpc50+8Y3HqaMt4BenGNhJ/HKAPDdI2njR2QojqBwV9kJAKSiSmXQ7czZcUzB81fw7HqV2qdctvk12bgmEacZsxKthc583oyrm5wJVbwIOBQRXDpJKe3NXsUBaGCBo6vylDjn6UyBOqiTZ5QmwhrJcyv0GGaeLFQPJtejw8wZbWzZFAg0MdEzdRf9Gbs6TlKLvc4ej8kz/BzPc0wttBr91T+7qxjIRacOOZc3+eYIwvve/x4UX4G53i+E04LdNom9Q0gCWoxzvVD0NqSr39Rwa4zhgC6bYRvMgcNp4Vc4bg70jReXsRFgxVCSHU7l68suYaQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5543.eurprd03.prod.outlook.com (2603:10a6:20b:f7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 17:15:42 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 17:15:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 18:15:32 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PbR9s77WGUSwiWTadFgk+R9hKpvK4R30] X-ClientProxiedBy: AM6PR0502CA0058.eurprd05.prod.outlook.com (2603:10a6:20b:56::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106171535.1256171-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0ce43fc-8200-4b85-d844-08d9d1382b49 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4yb2mdgwAzXf24GJW5lOSxZDsTeiQvAazfBc7z9yjQN0NmHOd3Xi7a11j/dtMFPFg4mi5U5ZYVQjBDjn9bUoLdZrVvStH3Qmkz6t8eNbIHlXvgkILV6z61nntqIdLGK49bWgzPXiUSnVJ7XZ/6yDW+HWPrVDmy0UdQjZB6akEeVfSgt7l9NYIcQ8WiTn2cKfA8OC2CPpE6mcZhmK9bjTxvnPcUuvSLayPkgQGSChNBmpt4Qgaa8G95arHfACuhMrYU3CA1xJicbcLHpJaGpX+bRjAWjYcs75A5UADJLtzMkiEQ0u82fwyCag5rhLAqIAXzvZl4nmFYQ3ptUqum57TZUN2KnBX0BT/pEpWD/MQ6gsRcPH084jkGuwuX67+DhEChLme11RgH38aVTZ5stt3hcTD6HhqAalvcoa00DVVBnHmm5Ha8DIxv1zrGzqOuChUQLwpREhoJ5URbeYMsB9l44RMVJAskFg7xaVNrXMxsuev7Im9rfGWyewfp0SxrjBHFQsUAT7w33VXF9NfHBzwMGhSnTgpk7I3e6LVZ5vcRxsdyiaeJKak6emHQ1WaOTglfD17uuXZblcXeAoDc/xuF+sdwcBU41VmfCzryZTONgqaupeQvpcLlE3h+73hcRqYE50Lwz0cBh6bnBdKss6oWnkrRFT2akSzIk+gAYxKOGAVS5a3WU9suZBANUdqWYsPtvuphGfd3E0iU1g4t4rVgUlHqdOAtb6qpNAcaLiEnbJfpO9zIO720g5vz/gZ88W7zi X-MS-TrafficTypeDiagnostic: AM6PR03MB5543:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dIaySCnQERcrjgiY2fm7ny3MRY4FH46KEX2Q3zfj0wF6fZnr5oHxycX6cNmQAyTyx/j1uYhcRiZt4D4NefiWndVpAdxirHUne9Z8pgwLVyOeh9uaEwIGp4gSeHgxJhKHPibOt/9W9sCYORAKhubHM5FJBKVi0GiP1G0lG02XoKnh6NLilcafpvmSXo7+3AZSl9Bg84n67YR9KYciVmE5/ZWd2fAY4Q9B1xWdmBPfSnbXfpgqHW0N9ewO9/JaGr2DiYEo+Wb+jaXGHLYqnuu5fiY9km+joxwgnRIsTQdX6052RdP+p64NoUuwYEJpBdlbpk5w95TX2aVhbHktVRWEIlIoKpC55gHWPJit1SkAHSkBfOmmGWThzd3BsjH9DI55DwMgTuX6SZJpt42tRMyUwVpNU3s9V/hv/cUdbPoCVpyS9H6/M9eGtl82J5d/OmtRiSkBg9JOuRpXBwcO8RU6YzmR0IM9XKe1Bs2aofK+nEoIklfXBgwIiHImcXIAEoAPjGx8v82XMiCKtDtVszDysqzQ7RP+hPSMaqaXr/hfgL7exNFDgzQ+5whI0geaXjwhSAjWcqywojR/iqwJk1KJVA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RN61VmGHOcPgyisraEi0IQVfnsLiC6RKleDRcFmON1lytnHU31CA7A1XDeltaS3JfULTBTJ9+PGTAaTEgO7+1lJVKG41ABkmeycx+c0voHmXHDIHthuR63+9cUamsHKDrjy6vFfqCIdcROv43q6UkbVDf+xMjadgup/YO36mjPuHjrssLE7H1Ip3F4n4KBHcbsl+w6zoNt/92xNcb7oM5qwqbyt4/5hCT1o7nlPZ4YIzuqRVQag2W3bMNnMwqxTu2qr/9rxEW5qL7P42g9KTQNE4UyCcNrdZZmR0YzH+Q1oX8ozPhD2iSI43MNIHrEp0c5DikIrPeF3d+ZhR9d3bvz5SXEy5wMvc9+QNwUpdOGoLlXXeecK8/lhjLXpULKZvRXPB6P77Vi9waTn03M7UKByyGxO1nXfarHicwZTD26RZtitRrMxtIn45wtHe/qBCyA/LWMcaQSNDvDb3sjWr7rmo2BO3uDJoKsX+4gDRhNFQEjTgObSI2okIYUieoWrn/u8Y4ytfDwO2OWLKoKJfjmIC9hMXqy3UTj3QXMr7uK5d1JqrZxPCKZAcjfWH+oNDZFSTUA9vbNw951rQLIjx87RpLmGApIzLoSjCOD6b1d838GB1WfdSropU3EZu0ndDsgLzXSc9+O6KQyMsBwx01hqUjmARQoWRNXi6lYBj8Upc0kRtvOjCGankL514Q1WcEuQbI5+xaAcnUG9vEXfZVt4zWmkaNinwbqnUWIF2N1FqZ3ZGh6XhVc+kxqhOl3i4e1ZmJ2CpPILryti2/v1TuTT0tTDGnLxMTtSbUPN/Wv8jH8UgadIEU+qu2oFS6KgNaaJIbP/zwXI0ztrw+BLBSlAlVw301I5YHjLOJ334Q4G2gft4tXSus3pd0TT5A/Z6MmvlZF7rflqZupZwfMaA3yBllLW2eSIOd351Zn48U6EOa1BujRA513M2zDE5sqIWK8BKqBep+SPleeAfZve8Og== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0ce43fc-8200-4b85-d844-08d9d1382b49 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 17:15:42.8344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5543 Subject: [FFmpeg-devel] [PATCH 07/10] avformat/Makefile: Add missing alp-muxer->rawenc.o dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xfzryTG6/NRi Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 6bd8af1bca..1d0396ba3e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -87,7 +87,7 @@ OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o aiff.o pcm.o \ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o aiff.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_ALP_DEMUXER) += alp.o -OBJS-$(CONFIG_ALP_MUXER) += alp.o +OBJS-$(CONFIG_ALP_MUXER) += alp.o rawenc.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o From patchwork Thu Jan 6 17:15:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33129 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1836507iog; Thu, 6 Jan 2022 09:16:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRi7KJV6Qip/QPn4r4+O26+Dgkou9b5z+4Bfnde1tRX+8sI7L2JL/Z/DDlY09Y+yQSFMMO X-Received: by 2002:a05:6402:4386:: with SMTP id o6mr60104044edc.47.1641489376142; Thu, 06 Jan 2022 09:16:16 -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 i24si1310932edj.307.2022.01.06.09.16.15; Thu, 06 Jan 2022 09:16:16 -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=@outlook.com header.s=selector1 header.b=bFc3t2UP; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5223768AB82; Thu, 6 Jan 2022 19:15:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8307368A16A for ; Thu, 6 Jan 2022 19:15:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fXmbdIpOhY4WD/8PN5mzPUucw3lxoPrdfjSymLrvijSCoega8KpwjTMT6XPVGwzz2zovPHIvpgt8pJTfBrjfQ8YvSzBm65Xoc7M3DKh1gdUHDvRNcVFCxWnA2VZicUMoHG6UwZwyqCPt0VuqwaUeG+qcGnJ1j4b6vlk9paoV4wumB0iiD/enSg2rokuPJouYl/UN0Kq86mALkIqT/vjR0SVcnqz0/C0MulSOUyYJF/kOoWrE0uus4lPLe6RKpvSafnRX0QLI0eIxmsMKEnEvv+PYEa+3oR11VCccvH9AW6KfT6Lk2Mj/W9bqPGlhvRsSa15drnCMq8hu6uv/hlFHog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vRHTD8KgppT0IRPpwiXJHdQRw6l+n8NtdJL6sXVd75o=; b=Hclx0PdrfOPVKsLgMKp5/gWMSnEvq6ukdK0FWtr53WdunoNVIyl9vVpS1z4Q3VY0mXgM8ArrIdI1ybeif/XByVhpswIF/llpQjFNrIJB7ef10XTM9K3IwQOJcTpOR9UMtANJv6GQCPm7KrcDM6SO9Gt+cVEirFXY5otoTfWqOS05zfwV2hwEDXPG3UXBIG6MpGJsNsAt//QJb5Sz6oAozqrNlSeq5HNHrZlKu6eSUsY1Y3LbvNfrUiwZZzCFQYE8EF8MR7BCZOeOqbbClyDc3B9hlmVEKOAQWdOn+eH/vkyIkbtekFZuQukZB0eAgYcoDabJfQyaLDus2dnqO9NOgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vRHTD8KgppT0IRPpwiXJHdQRw6l+n8NtdJL6sXVd75o=; b=bFc3t2UPE3QUp+JmOo1Z3lKcNAkKXfJVJ9a+9/pzJZUNqez2eY6yWpytXK5URgmyIsNDMzxdPsgOapyir8hT4lMN137And1IpWJtMnCgptLh8+zd5oCZRoIBsDW6u30Tjg2evGtIoB3RQVTkjSGvfnh+aGV6Fj3dAI7BRqd9UQYTosY1MsHHTMedvC17Hm9zwqRJ6gUKAd2K2KHPXYlwEXOZd01dCi4ljcebqqR3DVa4T1Njqbxnt/hjcJjs36D7RQzp5po43MNAxG192mc/ka+4YVBtEmR3R9qPOPjH09YYru2+hXJPGhhf/wUQBUYs8WDsyMkz106sxiX8cK20kg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5543.eurprd03.prod.outlook.com (2603:10a6:20b:f7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 17:15:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 17:15:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 18:15:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [cql5z/B/QBhWDXrDlx3Ww0Ghc/aEFGcp] X-ClientProxiedBy: AM6PR0502CA0058.eurprd05.prod.outlook.com (2603:10a6:20b:56::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106171535.1256171-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d29c89d0-89b2-4474-0522-08d9d1382c5c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JEo53u1YRsu4CX+hgtCvdIaNocv5szdyWjSOcddqE2DUTpBmZftyRwBeJKF/KuDZiXr/Lh+tskvhwkYMWE5NBxgYZGxEOf0OErvy85VA6VhchyULVRUtheslQE53qlt+kq5c5Uv6tO44nGCG1fFU+sjx/P+oOXYVUoSZCpSLGjqSlVzrmP8fG1UQTjUR64ox/tNe84k8o/ZH7XE8VxhwbZFp67nBa3ps7HgDdR7eNJGpGUUaeW0LeVBRI5QC6z1QJLONueuaM+0wdt8R+wFiKf906ZevNR43zRTBuL31h1/YDrLl0OmaFjDUclUDBLPeu9X0oejH2C70fkgQzqZrVPLigeS+JeyKM0KLRCn/Wu2SEOXCwZ3cbjKWfEsHfQj33I/c+xPRZlRdB64gFT6uWMKQTalpcKtH3uUSNjDTgRKQPoAqZK9FNXVh5fLMUv/WcEvft3fn06qnr8aUCUfz+NtA1srzn5EA5ksCinw7SCzgyyM6gQIIQcIi8yoMegHldsylM5ZU0/fppqNGGKDlF2TEDS+N/GspBKUT+2zAShCX2HWX9r8aYY64gloNtsyfT+0vlZetnKENH4ceO9hKo7+tDyecOAJgFwa3iZjVmR589ZCqURCYlpHLpz3wkiGCkUz7CTEwFlIhdhBPKDY/IwRwwwlxPdiYiO8A3Ole/I9YuAXErM7hnUt3aGKHveST5U0oi9BboZPD4Z2Rt9d0V/hKXHe+5BrS4lD+BSkwaU/0= X-MS-TrafficTypeDiagnostic: AM6PR03MB5543:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2hL6Crzv/to+7KQycQtKUuU2fk7UCvDOee2ZvrI6P5ynmKVx1AP5U/oqjrXoPk9hDzwxMdyxb3JnT9FBF3CCnkWvgc83BrcMVBb2LM5Gkmjosv4FlI+gO+E1qXvlgzKxN46D9t56KZOFwwtngH5eaBz9NVt+ZBqkAaxrc4ZPgx/2PCbidqZwdvVKn4Dxj698L0g+HuVWU4Fbu4ta+EKOn+wtgBvfPv0yK9W4lXQeMxiXEG7zvgvLg1GYXIiLwWrKdQHQIiJMfK4dq2Ap6ZMEtACT3EHZiZddpZx01Z0y/TUMT3ep0NN1RSUlKI/zJcZBQ4o1NDo/x0+Y2jtSpfzLSA0laCCDGtR/hdB+O2rWlHDW4FHOm29knTBfnuaIUVV8iXszOttgN+UAFOVFgSg2QBNmuvOXHzVKnSmH9NhfdIopb9+X7uGSnfuKekM9imwulDZSijZUIA/PxKoDEFJiqNYM4I6L65iCXxw22jA6VJTJYSVqHOy+CXIgrdQV+7ooYR3mIUT0sT+moFvHNyEWnY9qzsPFDhazp0evJCZoPFH18EG2cMJcBzD6K2mFUAO/NjhpgqDpkN/jKFg9D0OVTw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UHpHCMoTFuuSl4w7R+FnHX50XsaJhVX2tQMMrZLRJH8Qf7MEjrr9JgLJ4CFhUfVw0Zm/3/jmevHTPHeVcbUJB2OmfJbimR1a9FHP9LI+Nct6PLEQOigVZrovtQzf9ruZ8dujjpHYzELygHZPBGk3p4rm6c81ip2IKcP+kWeBpVVEU9OTYOeRnVNLFzhJJsAMuFXvXY/5iuZXB02+Ea7UfMG2STmQOw4uy+vDzPMIylcxeHdoIpR7rEz3O+ja0LezVEALlL+ljzQIRsxNEo9kmhhhrEVkZjkAoNu0Q1FUWT+XeBKapUmcvpti1JIf+8CcOb1olwri/0hH7CJTvfQaEQZmkCShGCWTumlthTSB0m7pBdOxm7Iqyzc6XXYwvH4HP0xVXLN1TGuKaVmNWf0s0iJ0BB9fpnIZnIKXL2L6D8Rpd/HiTcq7aV9yukFwXET0Y5MCxC9J4sXYWZphj54RetvBdAlIYxTLVJ9NlW/yBdopc9CBYfCYdsLz0fSIX+u1bKK0Vf30K1ZSFKGkc5K5SrTXGKevvhL+xx3XyeursnoMMKAr/zjlLpxBpcpZpCauj4mZ8GdQhj5vZanbJT5V5nw8a1d+51MCBnEyGNHYuIjG6dqx9s+aqL5HZ/1ETxMEF0mW2J8X/b8m4MSN8DSpAzFSzKwh3fwNGD5LL6jFA8ibQWhfb2r3PCV50X8UdCtsOuYEfZHcdLLIBBumwSYpCYiW2ejsYZMkj9ICMYz6lXMQ1i7Nr/C+H6EcRxIs2rkxhl9Yq4LXXjJZbDW+6VbX43UDPGGt7dr53p/kLB2BLl3Bd4gBDmjSrdEs/mDbyMef3EXq97sU4hVQBuJUUC4pOHsqKwXZT/sE/nd0czT27GoWuxKClGXk4OOYclE8XjAoxUCxNez6IZqeTO4DnMHwiDCTcf4SmFlJ1TwF/YvGKt+8cxu/iPjlgcRQbf0Ss4bwIqIHWiM6dXUxGnFxHalNGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d29c89d0-89b2-4474-0522-08d9d1382c5c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 17:15:44.4112 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5543 Subject: [FFmpeg-devel] [PATCH 08/10] avformat/Makefile: Add missing amv-muxer->riffenc.o dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FAXXqiDCNb6F Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 1d0396ba3e..9f7ec6eba8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -92,7 +92,7 @@ OBJS-$(CONFIG_AMR_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMR_MUXER) += amr.o rawenc.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o rawdec.o OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o rawdec.o -OBJS-$(CONFIG_AMV_MUXER) += amvenc.o +OBJS-$(CONFIG_AMV_MUXER) += amvenc.o riffenc.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o From patchwork Thu Jan 6 17:15:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33128 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1836387iog; Thu, 6 Jan 2022 09:16:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlfr/uwMCEqa4dmuWWkCQO7X/L+1XkqtXVoOb8p5gIa01GMvW8yrNr3vNcYgfkhHJvb2I4 X-Received: by 2002:a05:6402:34c3:: with SMTP id w3mr57848652edc.304.1641489366760; Thu, 06 Jan 2022 09:16:06 -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 hz1si1234960ejc.416.2022.01.06.09.16.06; Thu, 06 Jan 2022 09:16:06 -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=@outlook.com header.s=selector1 header.b=GKRNqtPE; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5208C68AA82; Thu, 6 Jan 2022 19:15:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2097.outbound.protection.outlook.com [40.92.89.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 211AA68A16A for ; Thu, 6 Jan 2022 19:15:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i+yxU0I138vr73KQhTQQZYgG9L9J2aJSIbE5loIYk8vuSqZhJwBy+AlV7RH4Nd39CjKeV1SUGQAhtenkZemABTLGFliOIiEUS1j6H0bdF0jWvvn9YbE0St982fNLdcqJcQsHHBfXuWAe8raQd2foy6YAT0vCGXwziWqgRrEBl9Ns4j2MemriS4rhTQG1QoE3yDTip7bpnZI18KjRfVmIn+IUwhADJZ1sDGO5mdrSdzZ8YmRncF26OCdMJ1ehE6HkWDkEmpTn9ZM/FcbDa5zFxAgENM3jsSGdhL1U2qOBlQjP58MUxjV9DsX1Etrgj4z495pyxWINL14lAsu3gou2Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4aIK/UrEP+P0tiIf7e7EG2Y51RCSXYZ0yzoM6uPAaLk=; b=PrpTLb54gTns12QwWXRh382fNQmngP4y/EyNgyWBSCYjAXTPU256DOVGkSaMtrCALzhGS8o/1qySoZqgFXk6ZArIz5vGGxStWiza2f0iMOcPHolj0Rxv9bUx00XxRANLeKYRFnex3WQA2tGTKBeLfJuDu0tzBwHuPKEHsj8eGvc/nS1J6ApRCjOxfNPQNP4+ZEUJkRcSpaWptDXItgOY31C5VAJVX6zRlLtatG/RZuavh1Q/z2jsC5p9xnUdRBCLjgTy44ebZsN3MLFUc5XOX25k3ZI7MI/pCDwt6KEsicDO6xd5qIYRmlusP2j2aA5a6tCHiDx6kUoKonRGC110tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4aIK/UrEP+P0tiIf7e7EG2Y51RCSXYZ0yzoM6uPAaLk=; b=GKRNqtPEnLaF5g3SCtv49CAMPHasS+gBNKO/zbQSWwQz5NgR8tQCssEcLq04LpFYjSj3B29KLe2wLc0Oa0lns4SHdMsKXB21iJiBfookDhKpQACRywx1RGvJJaoZJPkAsfoMK/zNJWjgedQYUT6L0HmljDc2TdCfpH3o1MZhYEhiAToGR5SBWZyJfXmHxkYNo2DtKZzQGPU+19fGP1FynmMWBI3Holgt9E/q9eodl/SM5w2Pj/z1smd787Qo4sm9KRqNR2rH6SU4oPsw3RU71F/rQROm8rMnHMuucXCMNTIvyarhxpduPr/uZk4UomdKs3D/Yvbu5qh71nj24iqfJQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3525.eurprd03.prod.outlook.com (2603:10a6:209:32::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 17:15:45 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 17:15:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 18:15:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0QU//NalKsb3bOwN0vVCHSgSMJTjvZzW] X-ClientProxiedBy: AM6PR0502CA0058.eurprd05.prod.outlook.com (2603:10a6:20b:56::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106171535.1256171-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9dac3298-fa81-42c5-14d1-08d9d1382ce4 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybqlshfudtxVL9uSLMCZSNzVycU/UmpmogRcjAlznTVFbCJamjoPbotum7kqOPHsmB0RPNolYzcxukHyFfLq62CHGD3HNNw8ym0fRrcPW5ORpDFQe/g6GnVAdxltSps7BQMEc5hZ1PTOz0jqVDTc0DUiiu7FBDWNp2Lt7TLqBonoj+547fGp9emQV/jJAXlukOm9PN+9Omu77kRiS299jTMvcSER4Y4KiHT4UI4kWjLsjOT8Au4bv9C1BQ39cCT+940+4ZPR9NEq3FTE97fOg4n0XpGg4BaGWJlRbZ0kvmKh7cgGaS2T8cTOOJFZfnFzMpZpdl5E4Mrz6B7KzSZGLJ4VzSIctj2j3AFsM3ELMjar1ILx3typs2OXesNrdQg3RnLnGd+HrdkvA6jEwlteJcKdLI93optjtZHobG9ZYjkqhXJ+RwS1zOQKIGzk9aoAS1YL8wKvMp638Gu7tRGKqDkZ9BgKr5PVJ/iocaqbzlzh729MR+dda9hulGJzfu+F3jCq9R6rQmPMtHivUi10jTMTK11AeQVquGoBf1UhxraYP2cJY97ejmbCp7yvUGPcl2SiC7U0rnYGQA+J0qUMJxCi/BZBtU5iMtPqblC9pOvbaGX2p64TIHpWd4gbdXbIhUTDBhCA6Vwp/SyDjzCUpBIytNT9eOY4v+hGdCv6Hg08nI0WbxKBWPjDtdE+LMvtO/QqSTKF9eC4jv+mkzWm9PkNaS6skBfMvnSPoDb+lhhSIOb1Z8s0rjqnkD9Cfv5LIf X-MS-TrafficTypeDiagnostic: AM6PR03MB3525:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: deTzPzurik5jw/Ug2v9+u+l0Ox8Imh9rdo2AYeBTriygZxkkljcCuTz6FcMG9hXCCEaIuPfsUG7pzF7MET0ON/odrCJz0IaQ6uI81tAJzvXGFsyisY6x6zdxhuw37LPOvlECTcS79Y8dd0GzaxoF0VbDZ0JcWGKixAvfd+DTjnIEmhvL2CuAFAHwGy8s6bfspMsBIimn2kSESh1pr8nCRdXpeA+FFfUkkgEcTzGshBoEaq0g1duLPEfl3ATmXOZAVBqWAAyQicY86IS+zi2LQvNVbgOShIXZhn/qcbJLVnrGA/RGaV46HE86sIgVRngEq4QoVclgyb8b2F6a/J7YEres0f4sEohKbLjx5gEmopEF2WqtCJaR/BfIoqyT+tf4JnCKw2dQVr74Y2V/AHHobRHc6i9KbVoAHQ9kKAgg5B9QEXjZYYf5m6GRSINk2YSSwgMZ5q8h2xqr4Mu70rQB3AhpTtClEvamHcfZ65IqMuWXX35OFyoq5lnodZEnDFNDYEoGnnveQLykWED4Scuu98xoppl6aS4Ptw+tyei17GGnnlE1JIq7ww6aRdmaHPhDiE8Zi0j3pW0J1NE6zvy8Aw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oYBpCHcqsDHw/xB1BerNpNetYeigydskEi8yGLxtltLjMukAKY7Gtx3kQ1d5WXzyJC2fxWNGKK74WTbj9Um/h+aqh1wEvpobp5okC52RdOLWwbTBZ93gx3dlwCfsqTtIt7i4scCc1YZcHe1EXWDHkOj6kwGInJgEwHEyY3DCeLb2Tu9FQaJr5kEDhoJirDReHK7IyKVjSMZD7OfAK/dgqz+uZ1xVcVB0xf12UWmbGy8s8NkFoNOP2DiZ06EjwSBrkx9KUiH0xUquQ+rHYIjgXLCWL0rHnvoZYj6cJ2Wa5szRvzFFozm5EKQXVb/qkzRO6Zo7h/IWqMZfmgPFEU0gPCSHh8DkEqa6lZPc4+Q+yPRK3aMCjQcys8TAyANxouYkzODC/mRNbBNDM38oM3F5H4TQZSEkVfo5k8kdzNVTb3AzaJhRaKDtKMlaNQQFZbdkfYJI7TrJ8N/LEUBOEtUjjR0kpZ3EDtkb2GyFJw+sI12AA6Egh0g4QkDwHbo7KJRotQl6rBO+nWxLlC3Xz+1/FRQVaiBJJKy4cXF5nU1brcEsT/Grm+31DNn2BJbKA2Ek9kQiMumxxLjp0z2FdMg9BV+ta/PMpHgUdjbIM7t6MsYAhmPSos7dGUknZfW+BZSzgNe3Wd7vMf3xnGZGJNAtnb2+RynMPA6IwnaG+JTsEIJp7RUmDSfvP5AntWEimdO35KvhSaWD46ZY72vAOBTop+ULsP3kDFMyE86minziuqPpSbl1NWBZU6Wbc7T7pscHXTyGYSyqDqBofagjEC/GedYNMUbrBDDchg+oZlQZ+6Od/8rXgtPBL/cD1pjLyKHe5I+ffflV/cwz1fDUdFu6pvPlSj75pTOF3nPhoUf6iK3GJnmwgygxmjAQuGtzG44rAABMulFZM2rgQsFP6sAj9RUkV/gKsQ9FZ2E9Z5AVn2+9gKyBuKlYxErZ/U0H7eIUqbC9Z9El4AwcaxSRupcylg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9dac3298-fa81-42c5-14d1-08d9d1382ce4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 17:15:45.3029 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3525 Subject: [FFmpeg-devel] [PATCH 09/10] avformat/Makefile: Fix name of PhotoCD demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8xVFJDfRQ5+p Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 9f7ec6eba8..95972d5277 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -271,7 +271,7 @@ OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o -OBJS-$(CONFIG_IMAGE_PHOTOCD_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PPM_PIPE_DEMUXER) += img2dec.o img2.o From patchwork Thu Jan 6 17:15:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1836639iog; Thu, 6 Jan 2022 09:16:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsB8XdJ31i5p1QqbAKFyOmLYwe0MlGLxE6f8q3YzFmLly2NmKZRd0R9mRbXbXzam1yrT89 X-Received: by 2002:a05:6402:4241:: with SMTP id g1mr58976589edb.11.1641489386124; Thu, 06 Jan 2022 09:16:26 -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 hd8si1417419ejc.906.2022.01.06.09.16.25; Thu, 06 Jan 2022 09:16:26 -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=@outlook.com header.s=selector1 header.b=g6udxalQ; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5430168AD15; Thu, 6 Jan 2022 19:15:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2097.outbound.protection.outlook.com [40.92.89.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 421C2689FD9 for ; Thu, 6 Jan 2022 19:15:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hq1maN9sqeDOvkBiPE5pSxcn0rGUorJmktHPaoC1z7btwM6xsxU0HEZOvRZwtnpbg7R0cy6pLDm0r6s4vTnQYzYlQQvLd0g+68rtgsYltCaMofSgQxEO15kf5AcZSfA8TduQrzRoq9xj+aEXuva+DziL/vUIaDdu5z/FvQFnikbsh15oOdiny0uYBeOcRMwVxbfidb3IwJVs+PlibwsXSEFJ7KTIZ28SjlTjJ6rBzx5p++zG99gXeieNyKIZQQj8L0vT479aYx+oh6XNbnfVWTA07q9gtKhhlJ/k26Buif9Iw9brNdZQnVmVDkZ825z2NC2VZ5bhfl0wQ4yqfC6zwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e6Er1hWCPKxkvDS49ehROFo9yXyTFA+ot7E1TIlT6g0=; b=LWzBOEFzY+JPpnFGlS31ah8HLZiyuW74+Lw2rYH+VMwCzCrvmCdxbw3BHoFWBF507pitBbnScqd70gLq1BkeER059jTbyXZxnZF+UiNxsWgD7NLrUdASJyXNP2AGTY1xtszwfNQa3nosSqOQDrquoYmumGAiJ2UQEORGtRf6qxWVkT6O/cXbl9Yk4Pp/gUM7zPz+26+FiNL3iLD+CcxpENLbStG67S6aBaG3Nzlrz4Hk5hB+RnELRL2CQCAqhcKzcsskiCVoNEkD3voGJCnz2guvw0LUmtNg1wQI+zyVhdiRWwk7X4yMtQ0MM1L0oxPghQp8KjHUTCTQ+52SV6iBYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e6Er1hWCPKxkvDS49ehROFo9yXyTFA+ot7E1TIlT6g0=; b=g6udxalQpng4OdNiSo4F38YBUZoWAeEDSZzxsKWz9d7A/zrW2vsRwdwv7PP9r88IOHExSOu8M9s5okSTNCerw02LvCihoG4OTKX1cEdGWXFywnhz9ZXx4Gi1BAPoPStMdDu1DuOAwUwGOFkooi9erc+HT18i0P3tWDrjBdyDCl4s2edSGk8JAlL5piLXvhl9yJbRMxDFzHPdIbOUZqX8Xptp1K+MSjGvykCF8spRxdmqigTwuPclLB07d34dt5K+Lkv5y10ubi3ulX6Z32xHU2ppZ73uGs0gsz0icRi9LLiqB7VsJiKvFdwGq+kWsk1mdcGqVfF07eDx8fmzFyzGzQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3525.eurprd03.prod.outlook.com (2603:10a6:209:32::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Thu, 6 Jan 2022 17:15:46 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 17:15:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 18:15:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4VSMOZMZvEJhSdWX0EA7sbyk6i9iyjHq] X-ClientProxiedBy: AM6PR0502CA0058.eurprd05.prod.outlook.com (2603:10a6:20b:56::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106171535.1256171-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9a83b7d-b45f-419e-0b8a-08d9d1382d60 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybjcwscrKze6dzs1Kx2dEeAeoccI+nk2Wf467LHuI29xcS4yiH1jcw5+cXAfLBI+IHMskp9jL50+aZlR5GD1JGAyCZ2u990/eMOZ5NBT1mrvWqCC+CwfUew7i54ImU2VmBn12SFOCxNLfgv2bKivEN42EYKcli1PxJvcGSw8EVfspygzU/bVuvvBJwAiHR634npB32OH5dRYL1/GZqss+YlFD0OmowVeexfxtoI53blS0hIfRAF5p07PeydRyY5vaPmLjdjAhLi6yQhebgjLt61FN0OlAzCzK39P89v5i3GE7AgOEt/G2LU5zMFJ/RjBojP4U5NdT0eWDLcfKLMarlI1lGPFOcJxIvnlSXOxL8oDGntTgBWDf1Ps8t6y+5o3UEQ54QBkcL9OIMHufw4yTwZZvr5YQtag2vQq4vvVHqb5VCKaIya/fNtI+GxUIsM9nyRobg8MvV3sTrDKpwg6kalxm/wkb/rL+0XECDcvwfEmE7YS3Pa7kBrGOtO8vb8kvicz+FNoQB1fZkOfkEFIA4XJHRl4VQkuZ9viYUxi/V3DLhf3ZNdX++tnIx2+q8WrvMe+vUro1DiNqcpe2SB+Qhy7TdrCBEIngOS4aaVh31ilbO11n+19VOLe1tm/d8JvF6+/pS1Pkff7G4RSQvA+f7BfeifiMESaZR7i4fORwyFXKbwbW9qhbYDxL7q+/EgZbTl+pTDOVGjTjsJNHS/MaZSIGLZ1zEAT0IBc7+7UDmYFTKkZIKj58lWMeVKLbwe+zQ X-MS-TrafficTypeDiagnostic: AM6PR03MB3525:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kVWsVGxEJfs0t+0yfno9lWzJGJc86AaKUkz7jeediZEVVfLKegPgFupHzCggpjDST4gW+Chwm+6gg4bRy5YD9ldZgPJPpmZpvr9q3Yn3kXJXRJhDB63xRVUegRZfR0YWZJjACnsw2PU/BULw/CIWc0G3sSfp0pdGm8HejlYinQhiIxJjPeQWk7i+yhbTPu1WXplxVLbQVaT83eVG49dMavJ5pcYTwQ70M3IGETVhDQcIW390hrgit14UgrCU/LJw2EqV3skwdq/9mhOqvqhD5UccTBRMe7tYaAHUFF4008HOEExO0XDU6rf2CscHVW+ZAGD5ov8dMxO9oR2Fshj3vUzl9lBwjcckPgnTMfj4GAgTlplHSmShUmaav7dguzznPfRAup3l2f37113ybVP/TTcYkHtDdY0M4A1s5fijF5Cdyy95/7E6YFJHk5IoEG0vskKW2p0U8e6ZiLotT8zOr/WjNPHag638ZV1CzAvdOirAHl3Gzw0k9MGvuzU+3W1SiX5/3DEyUU7s1P/2eFoZuivsl6VLTQ0osoJBE4xMv5zEEA7fNU3LCAx+EHa7wQvJyzOB/N6det00fLUP0y07Zw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PMOLh7ajHu2M03jZTtZjAqu6hI/nycI5f3iqol5LcEOEHTAijm0uMct5cNLUPIG8CLwKrXlAYMoVVMDyP38sIywciuLgD34z0fejej5UpAvWn4gVNuNaRF5aqTxFiJMb4sf+/YgWMP8r87lN9RXqGAg5kLUDMj6HRnXpRTtZo4Kud0xyN9CzJkXhLzFE/ayWn0T9wWMLSYWSOawx/4IJ6U03xqp6eloH3Qyh+f3CW68CF3RfU4nPr/EgkajkuYWN7CoVagKpPl3rLLliVe09pNM06Fw43NP4rm4OMAG4QHs07ALeJkpycgKhfPVd4IvQQq0xkztgjqSyMZfuHfR8mTAaI110mmgktm1I+m3Epl3x0NicM9VxbUUrQ9wj8tTvpQDRE7MittHDgTKz/rac4JRzlJBkeUG/a2DhFRYv5FEV/NGhGVYX4VtE+ATYlpb5BkhUwIOiIXRg6waqUPyElFoAvFyj2W/BdrGp2ixuD10Wm6bm8Xvc4GpjdazDaC+o8MSIUZApo8lbVJSl+6zkzILAUFh+vDWPzugm6aTYNsVmrsn76igUvDIHNt0h696PmlMNTHwFYL1j5JvqvAxICVcMGNx6yTCKqjdYKx+oldpbnJtISeFEz4afpIX9xcuVBVe00YzkaONuXUVpOhguh2pOFPvGpmhe6WoLBdG4OY85G9LOJsNkfwX0DCOYg/jaOzlDRAwFxKqRqSgxYzqePecGhs//lL1xc2c5t7i63xfid5YK+sifJlDV+hzEJZ+F5Gj3TWCDTja9AoSMcaIMq403puGDiXKjqhDYLLnPeJ+4gYhyyTkyLJXIkEotFq21GXOXx6Z9l3KzUisgtZW9BpDp8U4Id/dpp43jigiVrpX8Zhqi6dT1RPb7v0jsYF3R7vRVQOJ/T6lZNjamUe9LnjqqgJL75gnTWjaczB+Vw8rMw2zwL920IZqouuZAjUJ2Ec3zTcNaTBt5EPQjgLSaCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9a83b7d-b45f-419e-0b8a-08d9d1382d60 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 17:15:46.0996 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3525 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/Makefile: Add entries for CRI, GEM and PGX image pipe demuxers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F2Zn1jpjxP6y Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 95972d5277..300a32bae1 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -259,9 +259,11 @@ OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_IMAGE2_ALIAS_PIX_DEMUXER) += img2_alias_pix.o OBJS-$(CONFIG_IMAGE2_BRENDER_PIX_DEMUXER) += img2_brender_pix.o OBJS-$(CONFIG_IMAGE_BMP_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_CRI_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DDS_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DPX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_EXR_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_GEM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_GIF_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_J2K_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_JPEG_PIPE_DEMUXER) += img2dec.o img2.o @@ -271,6 +273,7 @@ OBJS-$(CONFIG_IMAGE_PBM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PCX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PGM_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_PGX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PICTOR_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_PNG_PIPE_DEMUXER) += img2dec.o img2.o From patchwork Thu Jan 6 18:47:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1908188iog; Thu, 6 Jan 2022 10:47:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcARmlz0DKhNQL/rN45LeZ1RmNc5FjEKoeqDU33Iqrza5PEiBJM6rg1b4k7TfxLrFedCeo X-Received: by 2002:a17:907:2704:: with SMTP id w4mr46676136ejk.134.1641494855262; Thu, 06 Jan 2022 10:47:35 -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 q11si1567002edd.18.2022.01.06.10.47.34; Thu, 06 Jan 2022 10:47:35 -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=@outlook.com header.s=selector1 header.b=pwzOcAcp; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F6EB68030F; Thu, 6 Jan 2022 20:47:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075091.outbound.protection.outlook.com [40.92.75.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C65068A868 for ; Thu, 6 Jan 2022 20:47:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5min8ZcLiCLP7nR5f0R2hm1QnwG+2xAd/3d4efPbCM5wSbi7p4dDQJMZnVo27Xs3Ntzw9v+2ovW5fRwmMqsUyJMGD/MfYOQ105kEhnNTZ6Ctw6mDMIzmXIsqR0AJpvcLld+l10xQ7yvPU89B/H9uOB8ktpZMsh4uQS+cE7yA/cCC/djRUWpE3JSohXLYQNSkLM6JWw7TzlkqS1ONXtt+rzcPPf9X96/JiECZwJNlQXRybC8ur6dV8oj+G+YYxSga87ivGEoFbLiwjtCg8KMTUsGUerCXTvTxJjU7gGyyPu4el3pXJSPnWRR/8PUnMzKnVkKHvFWgEBTl3348eoQcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+ZNcVEBELTDidbjo1l27ysoPzKFB3a2auGquFXXafcI=; b=P7OljZNC8Zq1pyvJdA7RGyltAMYbVlpHywiuRBH5iDZndLKvYkdSq/UIteZwT0shDz6szfwzS+y2gtdkBCQR73NksyJC6hI+WZ/Q6GDRpcTC3oysuql3w5rATG09XcgtCiHisDSbnygYD/udWUnu9gc23WanL/JMOJaWXaHgDxH5cbj042tThNJQcPc8wqbYCp+KTmDbwKXYJtxZGbWLx/JvKoC2s/asCUObxGtfI+fgtVNMU+iK5ESlABo4B8ZQWCXULvw2RRbXlQ6gfdxEzfclV7bYKqUYcDWlIBdp2SPnU5FgsyCBYwymj98GPpVP21TzW2c6kmFYPWfmmMAO+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+ZNcVEBELTDidbjo1l27ysoPzKFB3a2auGquFXXafcI=; b=pwzOcAcpmkDD9tos8heSD2niYFhE3O3vVzGyQBkICV4tM2L2uGifbsgIuMKMURnIzOXr1YtyxCGTh2yXO1PAXpOcEJENzRajgej+wDimSs806lt6GD2BzzWbkMhbkCEAQV+u98Xt7+vR6vOxSbZiFopB56Xag5SkT8LPyPaecRifEGip0woqirlqw8xk5dPs98ng6tXhhU61UeCGuVMKRo68UQlh57Dt+nZDIPPgcNb9DoXpwaq4a/XMZZ9wosta+4IHYJ22OSJIh7H3LnIWy1+VsLOSmSEKg72E3UL5DGW/CoO2wKBwW+j3iOJLD3BWqwmU01tzhW4HdcjlZS49Fg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 18:47:22 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 18:47:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 19:47:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [6+cUp+MKwOVAmPUNTzBvTGBBSMhUqq+D] X-ClientProxiedBy: AS9PR06CA0045.eurprd06.prod.outlook.com (2603:10a6:20b:463::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106184712.2025099-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 337a8f98-cd10-49c0-b3b2-08d9d144f942 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybvd/s0rYEip7yGdrVFtUDp+1DxZUzn3gTo+HIrCwWhbq27Aj4dIxycvNBQRlL1DR3SnX7vaCpst/gMoEltuiFoPO8yatgW6yXDyBw9vJHtLCBnAQoiCXprGHoyOjWiVF2seVA70SGgqI4miYWaYaqqlpaalMfvLkrVIguSPay2nAo6XWhhZfBH4pixG7L5Uzm40GR91eFnBpM08ywDz7sRiDQv6Xxv8ahT6e2yl47GjeYQ3JGx54PSxXRtZtOhPT8+5ytMXF89/RJWEd6Ae/WgjRQcmznd6QNu3xAhfnmbisMxjUqq+QLEdQ4l6Tg96A3xegSLSGV4RuA6ubpQP7MrdQWON4SgbmAqnZBMst8JZf2TShnWjBEb/n7tp0MJQIa3m/BvSrfStsNl7tzEaRTBFkeLCE5vRri2j94snymhynGtZKmzVlbqFasqFWNcnRGGrUKHjvMGpsq+oNguMhFtzBzPOLhClq6+Vg6fw8C6efYaPVvsMy6zA5N44SCOQ+qjacRx6dQEEO7s+aU2D4d2cw+Flh8qgrGxZQsi7GXDfeZvnBGiPUwxzotcbroh/9tRZhY4I1MPXTlnwh1XRAW+emQGX6HMcPJ9aDabPf7SYrJbPDJ5z4GuZK0Q1nzmxP7vDLGmZL4bDayAbLiCJAPpmdgCpuVVhDpH+DGTITV/3EFQNJgsuBsgPYAcqbikeJtxSaWGDTQ7/An7XfKcBsyPZADdSeCUGci/ykUuUzPGFpJ3hfheVTNMFeUL0atuZbl X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NjwxwRtAHIbXMWNEtXGDop4Nev97KUyckWz51DVi6ApQh52YwS9JHUbS5E+s8KKToXEWS2JFgt4eMKtgNVWPbt8PMAkzQsuFoF0aQOVU9SRG7Z/9s5Y9wGmrzvVWSB18LN/7HxO3oNrY3S1KvFSSrrkWoQDG7YsJJgdxobVtZ654+qcapX2mme9Bx63NBYIe6YiOPGrUFRj/oi7Bks02305kBCeGFUsTFCj9fN9buW8BvcNiel6URwv6fbAGTX9Y1pmNzkqCObmMyvMJoeuaBTaWOqiy5o5UUZPku3eQXw1TV7hW9UWJtCZub/JIJsmn9QSZ3/o7uLATQjWzfO+GNJ0I8l2LyFeXuNYRrAHdtN9vrzbkvlP4EGPGc9Sh0pcz5s9nY3gJWmdKIxbsxLinALoLU+5RrL+TJDY4MUzWLyzXv5kVFaXIhpXthLsX8qxSWC3gplsPgon7cnx+CgUwP1h/F2okh5qLcSMAyOUdYLAVKqI99xEEZX5I96pcq2EnOaEwu5Gww6uwihIN1Y4hvXE9+lnhzRhfH+aPujZLssaHZmT4iUFLPqgBZdUuUOodJag3yXOrn7Q4EMlW8NmDXA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XJtxSvy9CjojEfKhGiHQPq/oWnHNskDY6HxmlMDLP1luBh89nojnxVSyaIquNmm7mb4kDPcW2uST3oEi4dneid0xBpP41Dzp9fF+SUAbxbGBY9I45HbESWRARhTrPMlKSs26A83DEIb+34DMmKu9Dj8u+712kiq2lrRUwNEDQXTgr2cmL+VfolXWFlFmovDG3Kuawn8i9lZ4PJcFMo/hNrl743K88i0j1094ck/A9eIJUtUYiYES+QMCpSI4mHX3uaNCrNeC9lHFSHITvi/wOV+JKmsZeCX6S6EK+qe4wzVrKWdHjLpMoadsMW21D3SecC3Z9NCfDgw/jTrtNQWrL/3QEkg62GD7APE74tGhAxHO+GIssEW3xJwW7dLM3U4ocAAhW6vsNdClWHZlRPycj/AWcjzGnSUKLt+bRu0DRECgD6yZKjNkPiVlJB6SKXEMHw+o+8r0AP6wLeiBQXKbzEqmsQW+hTZP1tTLjdhfNZzqi/om0QPbxVDf9XWablEoeUeh+WHbJoVLoCbKjAJhjfBvR4jwLEOvG7otCsUtclQLiro0KNOQyEfFqkwjvsoJOKh8eL1gKy7ka2RB8NxFer9zpP2M2/iUQ3b5JlBdf0K02Ya7mkcBfQfMnLb5gVUdfNMZYvp8/h55dr2m0qmdJxvXhOr5Ff8ImMKJI1rxYyjiGeeDQd2bcDhcssSIBHYt6u8i9Qlo3O4G905d5F0LfpZeV661NTN7cg7kQ8PV/n8IXT/psnMcDAP/bYUOU7LOL/qtKCUToB1s+V9s3L9OA3AnizQ9q+Qr4dg2dpHaiBpXB5E6N0SnIRBwG1tZhRHqAuc0Bw8jKn7HooarL4C/YVLZlXfzgg9CqRMSKpDAJ8FvPxTj6iCROqqUR8IuIWE4MRwEIqyoiRczYY6ZuRQ0csCQ9g/SKJj/raYcxOTgca7X7gOju6dNgx95Hu2vMA3m/5IZd7KxEdrdWrJQWeSQsw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 337a8f98-cd10-49c0-b3b2-08d9d144f942 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 18:47:22.4670 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 11/12] avformat/rtsp: #if unused functions away, fix -O0 compilation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /R6EY24SZbyo parse_rtsp_message() is only called if the rtsp demuxer is enabled and so it is normally compiled away if said demuxer is disabled. Yet this does not happen when compiling with -O0 and this leads to a linking failure because parse_rtsp_message() calls functions that may not be available if the rtsp demuxer is disabled. Fix this by properly #if'ing the unused functions away. Signed-off-by: Andreas Rheinhardt --- libavformat/rtsp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 1e091c7380..70c18941ca 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -246,6 +246,7 @@ static void finalize_rtp_handler_init(AVFormatContext *s, RTSPStream *rtsp_st, } } +#if CONFIG_RTSP_DEMUXER static int init_satip_stream(AVFormatContext *s) { RTSPState *rt = s->priv_data; @@ -274,6 +275,7 @@ static int init_satip_stream(AVFormatContext *s) } return 0; } +#endif /* parse the rtpmap description: /[/] */ static int sdp_parse_rtpmap(AVFormatContext *s, @@ -2006,6 +2008,7 @@ redirect: #endif /* CONFIG_RTSP_DEMUXER || CONFIG_RTSP_MUXER */ #if CONFIG_RTPDEC +#if CONFIG_RTSP_DEMUXER static int parse_rtsp_message(AVFormatContext *s) { RTSPState *rt = s->priv_data; @@ -2028,6 +2031,7 @@ static int parse_rtsp_message(AVFormatContext *s) return 0; } +#endif static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, uint8_t *buf, int buf_size, int64_t wait_end) From patchwork Thu Jan 6 18:47:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1908303iog; Thu, 6 Jan 2022 10:47:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxykwctvfTQbbwDBWaPIZzgqcLu6AjoJeCL87pmcnBRfJYd6A+i/qdYkJRmpOLlVzopRtz5 X-Received: by 2002:a17:907:6e25:: with SMTP id sd37mr47816038ejc.529.1641494864568; Thu, 06 Jan 2022 10:47:44 -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 h9si936670eds.576.2022.01.06.10.47.44; Thu, 06 Jan 2022 10:47:44 -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=@outlook.com header.s=selector1 header.b=rF6o6DoP; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5C9C68AE0F; Thu, 6 Jan 2022 20:47:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075091.outbound.protection.outlook.com [40.92.75.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B26468A927 for ; Thu, 6 Jan 2022 20:47:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UlDPJYQf3RkTfIYurKD5/CjKOUnKn3xJSGMrPCzrgizp2x8XtPTvwjiCESYEcTAC8i/m6BC1m3wKI9Ud5oR82+J8xcn6CGzN10pN0zhSs6ahJUX+pqrLNOGiuaMFUYGoCbEJ/tWj11qvEmJP58Cop8Vv8WyWmkAdZWOYHsvxgEbNffGucvnzmDLhX1kjuZRPKAGeyYvskglf9T8Ndc/XXpjhgrEIdORET29/t97++zpbRrIiMtQV2mvbsNtbbk6mAlssGgp/MzpoHg3bVOUOmykbO8lxYhJpX1A0nFY+n8ks8pZRpM5owhwmPEZU4C6Fl4H3nijMxvuL7rhWE9qv9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eFLajSR2Rg9Cv3mVH5TYK3vb8gP3snysWlRNqfRhtL8=; b=CLxjzLJojPDNz0hAmkJ5o9iJgZ36IGg8kHYmbUcasA3QQKgRxJfZDnroc2pYo0pNujvxFm7CUK+IINILgwOOpAT6PLoUhcuhlgOuXXrXdO7Ck8l4+pNkhupY1XyYABVktqz6a0T3yUIafQSX5GeL/Ry5n7l23MiEJhk9uGcUZS2g4lc9fRLizBwLLt7LmRgUNoGhw+DkfSC7HiSHjA7vsSYuEDjmxp6HRSNa5fGv6LBHGBg2ilvDg9zIcRZToaRDdtYln8/Wbn/VdxeYE+ArbiudusCyaeC82W8niFOdSOMv3UgjDZCDAmyqEvm9EEU+27hWm6Fj4pHGVKiruTSCzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eFLajSR2Rg9Cv3mVH5TYK3vb8gP3snysWlRNqfRhtL8=; b=rF6o6DoPEeDQWOySj+aAmiLl2rtdEtl3eUWfPFUtRLoC8pcRtmGLx0kXkeSpawnCBZIPBGNA7yEBNJnweEEmUqHmFjI9blH1Ll/rPKUU66aSC/wOCJdWeIjQgH2LkLK3+8m+A/dJ+ecTLpQo2puEwgQ62P4D8H6qtlEDJdQxZm6b92JyhG1u4XdRbx8mdrYDmbnMh20Su1dHWS5UiMR6TC5kuwAo98lcM6b9F/sblkzWGhFQR+62OYI1RJk5fDv15hREz4Q2XxWGPUIMVVqSiiNbsGYDAvGRWaiJxVIpWUXypHOzFxeLeep+yLYtGCTFk9keKPyKAUuyYMuPYzLfeA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 18:47:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 18:47:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 19:47:12 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [n98nP96Et2qATO0q7I14dxrf+k/7LTko] X-ClientProxiedBy: AS9PR06CA0045.eurprd06.prod.outlook.com (2603:10a6:20b:463::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106184712.2025099-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf59b729-7b64-40f4-df5d-08d9d144fc44 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybKR0TJbM4CiEQ3oXWqmJgvPIVUcWBwde0QHJNoVSwq7JHneeQ4Gf46Ss75+UKZJInCATR+ZDwo9Wok/Ifi0STW9LvFTgaZh8r3aWF/jPex9zKSmjnNCYCIFzUa7M3JFDHhN7JOZJ0J8ThDlNahqqqgGQbFTlX64vxXhklagQfwfyZ5gjpMejKNftup1V+2p2AY5c4oP41nv5KxYdqR/tF7EU0P2/Q+4fas3Suw3w6aStqZAWYjiqzqaj+VHIYaSp1of3qqj53/1qBZ7w0Xg8nvM68Oxxd8Z14FDRyiqk4sRbUkgf9MB/87mESPVWh+irABJ5ZUSTy/sLyNwvrLWvKzaF13BbU2MmPXXji3mfDcK7AH2pQO59N/t//IRX720f7az/zobLcS/YA34SGLnb0cp1q8c/nXuOa4nhmvm/+qXVaRfZciAwX6xvkpzy5r/tOiAKKSbFWno123z5Z1UVS3vS9kVvfXWpqNnS1/EWX9/1H1fLahUx72JHICUeLxBEcQED7Kma7zZaBzpLWp7fI77kD90DKWGsRPknx++lu7WKtYFIkSLkRmP3s1n8evC6Myr1YniZ0lnNfp3//EXHfIbAyo2AF2vgaBjNw8bAB9s6ThM0/85jA3bA7lLnBisKNQ3eXBiQlkQ9ezqi9Se4/X01tCNmfpRhBJox0EN6qmiitFAEbNUo4HLo4KMF5VSwa5+nPmjDlwzwFUKq3Pd6ZOiE3v62c48+xhvh4bV8rtbdYrOyq0DQrtsoTihSXJ2Ls X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VFNMwl3uY6fbBFrex8HBJWYbuyy6KcVG/u17ZJUXVlMoqh5LncW780J2ZfltAwbCkEHgQWV+B70m9gCufwOrEmY3/qCEk7q/IyeqjZVpmP8aoe6zf5he7AfZBzPCd3geFnLE9L3kzlJV96+ILn+jotEYqyk/NJHW/DDMQuJJeviEHcsRZpaIt70QDpDK+G5HJsusyN/ChVDqLS0dEDnhtPmsI9wUz5yJimT+B+zqL56TC9tooKW11erJ4PR7r5vkxEThnAUMkRf/EnVhXCNjBWWD3spayfe1dua4kBAB56GJl8+1xTO6ApAwk1Z7f8VGXESdSkyjXMJCoEPFbaq+uNZwiBwuGJfMC8Xj50R9feEPW3g13RgkLexE0ve1CYoRb5NxkvbbfufKcnddtE28p2vRsuPSPKgODMoIchCcOSVm4JJBM1lPtNvv5KRqqi26HjCkPZw2vWrs963k2UHvw4LYu9/0SVPYEbLu9woUS/ZD8sBX/8g4zoaNSJLti4R6XAPXkXAPSCHexVK5XCZwG6qvX+CPuacDOqLM/kyzBlT8aBRmZMG22skVVK3V5o60tiW73zPwhA5sNRSDNdg3LQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S34lOcZSZ4preQ6zdaBtUYZOGpZIMCWGBfbuQgapjrR7ygivd2lRuY4ynY7rT/MhtBKT0yZfliqkJwtB3RbcYm6c4lLK11Iu2b/FBuTnfmApomW69VKfZZRRNgVbME8NYJ4/8W7ToED1zK4WYs5AWZAWXcv22FWSt8PUM7xW2qF4uAhcyibX8F7v3IqYkPt1YwgBxyiMjvAIdT+2U6DWyGasYfRHAK/UKsCvtq3QL465fuycNxNdmU5MKPCxPc1FZM8H+O7IkW8iGiVHjBErRWMegQ+95NeWtyfb11eryblTFGEx7z8Upl9ZJ0yIlUpTArjnpeEz6VL8YcdrjOFkaq5BSsFwimsZWy6Nhhrf8exroUa9hAlXSHWQLTHCLibR4YuYqyB8irKumuBfzuUHjYralV8NvR4UnTQ+swx9o5KNUczdbX412aJyb7/fV4x3QKNEsQ5Ofnj9tpV4LOVPkzwNclIE2WfZowr/AAFi9SFwN5gn3GPteJOobJ71NIhorroyBwPU2GnwAZo6oxkSZqhfI3wCE1smP7+UspHLROXzbp4UG2LrVm/p+Oa1YQF3niBX+/MN1v1VSTUytYi76B0ZV/JU6uZqFcXLHuVE21ok/UL3jC48EMa5FwBR2VSZUMn3GxYTvZpf97uIeLvQCvxkI8vTgbepH4b0wHZSD3AIvOv55PuhGt9kg+81KE2atbChCxTkvs69wFwRRP4FxSo4S7TkWuG/3Vshev76VKl5qefZRiSJ9L/70Hx8xd/g8X7XTer/l9VVQnXgxxjmE0ToMXigRvoxtt1EFPikkLPOyN1b+AL1E4+8B+tbzM1Kiko/1CDHYZZI4ZYR97UwnmfvliXCa1OmG1ETSx0k/goIIvPQfW0RulPu7NBJ52OHW3+WiMy5RpnmrrQIMaOxNc6rsSolZV+bCbqXXJi4ibM5gXc/ihw4F8IosD7J+6va+8QEBXTp+R+EhY382bXngg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf59b729-7b64-40f4-df5d-08d9d144fc44 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 18:47:27.2033 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 12/12] avformat/matroskaenc: Fix build with only WebM muxer enabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sOpflTOtFAUt In this case ff_isom_put_dvcc_dvvc() might not be available, leading to linking failures. Given that WebM currently doesn't support DOVI, this is fixed by #if'ing the offending code away if the Matroska muxer is not enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5cc59dc9f8..6ba1dadee9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1123,6 +1123,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) { +#if CONFIG_MATROSKA_MUXER AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); @@ -1150,6 +1151,7 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) end_ebml_master(pb, mapping); } +#endif } static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, From patchwork Thu Jan 6 20:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33133 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1963637iog; Thu, 6 Jan 2022 12:08:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRyGnQb2E+y+2H1rU/KypGU+2jcs2HhK5XWQ7SqoRc90IIyMVrc8iLqeRNV8CgorQeqT2T X-Received: by 2002:a50:d710:: with SMTP id t16mr59831979edi.50.1641499687870; Thu, 06 Jan 2022 12:08:07 -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 dk14si1444761edb.265.2022.01.06.12.08.06; Thu, 06 Jan 2022 12:08:07 -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=@outlook.com header.s=selector1 header.b=dHX0oGG8; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 566C868ADF6; Thu, 6 Jan 2022 22:08:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065097.outbound.protection.outlook.com [40.92.65.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88B88689D48 for ; Thu, 6 Jan 2022 22:07:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VSRXQAYFOMXtKwjdOiv9Wgd5m/WPhnY0e6aFu3egzUjlJpvicxHBuX1gQf8zD9p3Ojor+dVRiLRPzCK9DKln+maXEQm2lBiQ7fsIaqe9sSmUBV4DpCysmMX3kB/J2stWqazvvtDx+SbaZaCXVewiFvFVvEQ1NGWCbqAskDSdKskD11ITDScj/P4ckD45LNpQ8qmvCGQ22+kfWlBMhy7zfYTnLNSKVr5vOYeWn3SXNzyZazJsE3Fq9422RjXEHLMPV/qq25ggTkQZklAJ5WUNVo6nLgDPreyp2SPYKQZJE8Ve90gJGdwiAaDb2E/FnWjoHKBGDwJpLqYW5gcBb3MxEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q5YPTvnDUhwPv9DKXGnzfoEx3W0koKWgypn9gmL1//Y=; b=ftQ0JoZ+QkUX2/TUeeQeQqOU0C++FWXQWuagvYCBveQaM135fM2UhMKTZeO6frtPKy+a6d43qfnyecZ2tc4Eu4UPh+8EHuvNhuyccUw6+dQiKKscbe16CtcIcXIUMaX1N7zxwbcmAxNlAuYuQmkpEY7OQWR8d+3m/tP2w3MacIzhTCVpZCZSrs3uN9i2+vjkooukKxj7oGVRo/cifEAchQrs6xs1K8EtilxDLHhKVYZx8q+/2MbFC/lpjKzYJHYYlzBT3FudSjsLIhFPNdSFrxDSMZ3X/Zj1DmAg+BlTOgblcVJT782Zq+mnsOeG/ooGDZcctNsakyAWaknE/FfifA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q5YPTvnDUhwPv9DKXGnzfoEx3W0koKWgypn9gmL1//Y=; b=dHX0oGG8tNXRoiKg4RZhstLZ0RLskbRxQ2mX73n782XtxxOjx291rM7L5w+HCnNVdjELr5mrGQta7gg3YHqywgSQ+LgJQBRQ/GW8Wqt/2fD+LBXzAUFgZUguTjAxqqAqvgaGMwojGsQmgkjCqjt2c3rUdVIPLokVyzdUiR0mrLupEtU4M4qoDfj3pDUd3tlEJ/MLmj93P5LpWgvuclZOb2EncTaRALbCBCP6OAJsblb/4+YXFaszx/GNSxwW9EknRDbWl4roVQojuhQAO6KY4NvR03TA+RAU5Gi2VGfcIaQgXcjnXCqQVEjxmXL3v/bzSE61n2pJOeWpWb5UKHccAQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5542.eurprd03.prod.outlook.com (2603:10a6:20b:f8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 20:07:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.010; Thu, 6 Jan 2022 20:07:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 21:07:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [k1ujxOMZgrrexbz8Z9bS/9o+8mrWksiQ] X-ClientProxiedBy: AS9PR06CA0119.eurprd06.prod.outlook.com (2603:10a6:20b:465::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106200746.2333846-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b339eb04-5f38-4ab1-f2fe-08d9d150391f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlxhtL+nKMaKOLijWtGarQvYCHop8FjTUdDpwyvtl0DG1Ko93mgVioYk/gbrCWKgrSKQDHRx6H0kEp6E0qyI2k3DyrHXuxT8KqO8c2MH9saiSMza8woBSD+OSSVQ7+Agz5abq25W99TwuH9qkD4RfuDi+bQpVuBN5O0gpttQQlJNPVaa+kh6hSANd8jUBglLAK1TpQRM7/P4+InwxQqzMaCe9HBymnzm/GHBEa8Nd7tbxI5XJT3gS/3DQ+nGBWxnJ7BBsuWc9A0rHoOOVyfVG87+lAgwAc/E5Dori7IRdj2ANGzbs2l7dQNrKGFDUIsFEATEsQCLC8w/p3NN/4A/GbFmOa9XVCeKknoLqExedVSlUu0ABzGXvlWxxyVRpGR/uO2hy9+9ysUH+8L26BtQD4S5/fUmlGaUMnxSDC02mpQ+8I+1ZNknN26vzOmu7fXaqT/LkjE958qABfGGOsCin+VMq/e+bEcR8r31B/IWd+3NOGx6RgIf9AEzXX9NFh4xryaGkHUELXYV3EeLH6EeXaJHSJoJC/nX9cP/OsAT/ikGWmu9JoQnxjT/RwPq7KjCJ9MAuKNvpsOvioKNzjXLFGT9eacns+AlMwnrNzDEqAiKWJm4AujwojBcQ7YX+8JMWEy7mD8Z1fNfNmHmlnBt3fwmmALzdLYKTsXWRmQgCBQ4IYWVlFnl3XPKfIV2EfLzeSvO+MpYbTQc8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5542:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jv9AuOJYugZ8pWFInu7JsJVOieOwOMuo7rOKrZlYHtZS2g5xxdDxkZq6v3UjNXXrsl1LRHEcU2qY+4Ppjo0Ws2Xe/SZTMO36+cyMUkocuy2O/eAbnYZSNpeblRMQiqFSyPswOpuYf2PoqyhUL/OEHeMId3KmjTWPQ5fpqvJkqYTtTr6mYxOE+xulqLH45TVjsrLwIhBNf2IPTwxjJgWnuQfGgX6sS6RKya0/E7Vy4WsF/UkdI/KCA+3uja0v9JxXFn3WKiwa9C9orAJHOWTtkyNKjV0r5vQmFgDqBehA6muMk70e1s1TBtZHdhR1djTkBaukrlnTid0ZRPyAYxSWek9i1Yeuu6cHezreVrEbD0cgJSvL9y85TUXjngj22pDRCnfu/IoiW+TT52AuE3YckfwQG26Fy9SUdQiu+kCGM1Ba5X7KtOgeCBQXaL/QfPwhRYa2ldzX0sO9jFO7lRmZ6wl6oRQmVfz6hYS0zH+KhEpUwgXDqBBQ5eNP5Y7qrhctHnDkzABJeiHjro/wFAGLNEtD9o8N/kcOysk8UBIHobSeyfR9S1W2G8I6wLUb2Pwk5cMpgjOIvGKqvcErgOGZVA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3zoHprRVLwDX5sfoqLe+LCM9QsT/J4h71ArxGtexFTAHKbdG0xksJkVotPtT95+LKYfHlvyUht6BcEN1xCB+meQNN1/BTIcIxxVjzRmLXUP14N173m0824ynSO2TVkUb4enkzk/KZoU4ZJsZPhSvEP6aSrFRfAzN6Eq6wKGSH09ijF/mtSTJxKxirbfgLfXqsLxBTXrhl37mHaU/hUygYHZ/z32Jrd4wQlsf4IeFQQa9p+WBDKRMkefo9RKBx/H81G/Yt1HXlg3KOuPtbRbRtQoxxrY/ExxKjrqtQM9xCxZWaYJmAZwLcT1CfPyBK742NZ+IZsv0XEUxRe/8Fjkiu/Md28nN/KdFHt9gkEnysv7JGoVWkuz/XFcQgGnpsmIqlZgkKGenfbWsbZTCR401Obh6hSPzR0qlMbLR9px2XFv6/56T+IYQxN/wzQrlVoGaNVPMNHaL8UmlHbf2UJnE0lZEbAQRZJvL/xLD9Ba7oq69GbVQkuGSlWSOQZ9Ax8TpwnTLSWfuXrD73nsf2vlbcsdOrNdYeX9UZSeGoY4+UowrjbG/yRUPtEEHj2OeGALOQGJOgdHc5/TxjxZKnmUtYOC8gGhSnPCOPAeeKQlpsCLGflYFLpRa+ZsHfShTbc/k7tKEwnXIg18IeBVdPMZ4X3Kg18MAOjpw3zgKr8AYwzUi9pEI0D1gkntPGgAXgFGnZNzC5nPbai97LwAeNw70pCR9UZbrMUrlcqcdq1BsWPANjJ8uG7CmHRv3JaMOuWSGiurMo3/6fs+Cdg+t4wX+h2anwWzjf/eigqOZDOitFnRhbTz/NaedTqpZudkMsXwIs9f1l4PeBDbs1jpHs1GWx/Vxk3KsLu+Mpvn4ArQyi7eHg9TqsSTpdDKd71aY1aO6EBc59o/amdD2/V4ERJrQCCppyQbJHcqcqtgg6EefNSb1hZJaYC8ZaxXR/0OJcam77xseRDwtFb6qQ4Oo9ZyYAA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b339eb04-5f38-4ab1-f2fe-08d9d150391f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 20:07:54.7966 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5542 Subject: [FFmpeg-devel] [PATCH 13/14] configure: Let decklink indev suggest libzvbi X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JBfyAlrC5Odj Fixes build errors if libzvbi is enabled while libzvbi_teletextdec is disabled. Signed-off-by: Andreas Rheinhardt --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 1225faf15a..11342d5cec 100755 --- a/configure +++ b/configure @@ -3500,6 +3500,7 @@ caca_outdev_deps="libcaca" decklink_deps_any="libdl LoadLibrary" decklink_indev_deps="decklink threads" decklink_indev_extralibs="-lstdc++" +decklink_indev_suggest="libzvbi" decklink_outdev_deps="decklink threads" decklink_outdev_suggest="libklvanc" decklink_outdev_extralibs="-lstdc++" From patchwork Thu Jan 6 20:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1963730iog; Thu, 6 Jan 2022 12:08:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAjVT46Od0z9IJT8KLBnC4OOJ58IESBjVp+lHtUylQNOAIkaBHU1sGSKUwZc/tNy4aTnVo X-Received: by 2002:a17:906:1585:: with SMTP id k5mr46415851ejd.83.1641499697644; Thu, 06 Jan 2022 12:08:17 -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 j19si1575593edj.500.2022.01.06.12.08.17; Thu, 06 Jan 2022 12:08:17 -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=@outlook.com header.s=selector1 header.b=RHnb4OdN; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C74C68AE6D; Thu, 6 Jan 2022 22:08:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065097.outbound.protection.outlook.com [40.92.65.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B09F86804B5 for ; Thu, 6 Jan 2022 22:08:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M2/fJGtMQMbozF8ggEy2byv5sMc9YWWn8TyLl+Buz0DjAIOhpWUSeGY/Few4vbnZSNK2K22edkt0GEvctvatzPuPysPGGzPllKszZ6hPUFi+Hx2md3FOf/zfXoHfJYv3P+Y/6fMQjq+hY+ZjlC9ZBAu9q+3FWYa8ma1J4cQpA0N2fTaWGVGPLhqyxeqZLaFQ+M2ielUFPCRUsQYFVzb3yD+9zHpLsY9DbEYjeIWilq1w4mXKLbovyIMCE35eGOa5rjjojn/T4+2pdYuC37FslBoU9/vp6+Bwfoe0MAaS1vk+g8Wj6LNyKFevyue/FvuwqmmW0g6vDMfgQHv83ad1XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RGmq9KAg/ynVpeVXXtqEVXbgZRKF6Mc/yReZFOP2Sxo=; b=bq/JT1HLj5qNgjDBaKibv5GjmdlLEz4SWtVDa/SjDuUkVCEBrNjrzEaw8grEsOoTGLXm9Gq6bMH0y/6OlVvcZHJkFstoMLmt0iFJsTpJluD9QuiL+jpKxkSGUqKAOCCTwoZAiZKrI6XSXn8oKZco+OWM0XQswCWxlENtNAlG/Wi5gq7LB9uQ/WXmcEnA3/sHuSEn55AAH9r3+1AB3OMjA73crwISMj60DJPh7PuCvwAZ1fDjWccSSILRazB/GWQPVmMbLoW2xFt+paB7bDYYUnfST3pnMJyhrZqalCR49BfHBGwU6Y/kBDHu88qXI2ZAIA/9AXGCmT8jBHx/2Pnj9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RGmq9KAg/ynVpeVXXtqEVXbgZRKF6Mc/yReZFOP2Sxo=; b=RHnb4OdNGfdEE1u8FJbSGvVtDHppzTSr80NCWIYwG0JWdhRVjiU+YtgzdiRw126bQH0bbm83ASOXU/fu0zuQ7nKfcGswu7RtgUVooMSXIoyXhPeMhtNJoNK7TUE/MF/inJs5YXqPl+t2V2Sg0Vv+B5yiUH3ZuosqtbG1O2+cxTjvYxIXYAxyTQs5ayDvlbvFnhDnczSyDpze6jUlHawa60x6b8KXMMYMVahvMUu37kqAPtLgpasLOW0IBaADQJn3n4+W0IRDvVXRXXJ9dyq5o7BdfuN6hZHJ0mJ6B7Zs595Tnvnq7dDAoCpT78CKdlTgaY9sTRHzWzPro21aoevtYw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5542.eurprd03.prod.outlook.com (2603:10a6:20b:f8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 20:07:56 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.010; Thu, 6 Jan 2022 20:07:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 21:07:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [G7p5c7oa7KUvm/GDktG6d9J6Nztk6Iup] X-ClientProxiedBy: AS9PR06CA0119.eurprd06.prod.outlook.com (2603:10a6:20b:465::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106200746.2333846-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ea9c31b-005b-47ec-e495-08d9d1503ae9 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybvd/s0rYEip7yGdrVFtUDp+YcRv2EHo8qX5v5SvQoxaP9RoVw/MpPl5ncVC88/+s2vNBLdg0B0k+o9vxMXELPmy4DwYiZGQwacYLSLW25BHD5drzTFTTbLnXtHCZIcuk8yzU5f01vmiwEZ8Ycu0B8k92c5ubqIdxYY8LI/NBSAEYLLIv04H5fp1sRqC8YJQLEbgvE2csujisIzWTuJrGVBT1NB3TimXVv2N7zrUJVWvqlmjMg3JjG0SeO5T8SGqH1GQlgrditxKcicxFzANQvvfR5ngf2PtBcVMIaFqostKZUMv0NqPCqAoiwQ4Q51H+mo+W56KW++xJVVB+Qc7vqOhy8IoHSKdLp7l8sJeJ/FctcN+bAWy9sOSfGSCZLfIoglsyjaUkacdP0tY5rjlZLr7GNejXeT0394CnwgIDiTcN9arnWW9U5nZTDbIrg3ldJD8dWGOoBXvm862QFyZIAUFcaDjC2DdWmSVnuEQn/7M0aw6fJgrwuKmBbsP0qJC++kNYLiYXJekkrOPXqUkgJ6gNKeSXYv5pK5gOdlZiLAvrX5XRcJFyuRuN5BmMqkaAaQIq+4YVdb+pine08kb4GVWDyvWgFggg5aIR8bGdQY8c8W3Xop6844NIJ0Ma7SSMiqLW1DxvKMd/x0IPjgDoz1YIgw5hTtFRkmemokouF0OngOaQFzEI37oKc8UQq2tt174KHOcYG7edstzXD/OGht1ost/jJu0J5hrdLDB6Ebz1j8rwvWHj61xZIxL6K/ZRU X-MS-TrafficTypeDiagnostic: AM6PR03MB5542:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aPBVBFibC8HIz8SBCR1vZBJFiknkPkxPCAzDInHPlFRcHmD8TjwLCGvMd/RoZeFsIa0wDD1RJJwH3bmQ+fUOq4dwbLIhlwXlkl0vGNd5AHAfvf/zrAJFBLgVwT5mgVUXe0ryk1kUnzQ/RT2P8ypb/CTsH6QknAVTN4PhNIBqeuTiKCy4pcDQhCQySoU9O/1aJvuRoqCfiLk4KMSeAuljBVbzRYj63t4K/Hix7Kg13LB1oii8PD7J1efJPjweFSMN/XpFdeju4h3NNi26GJpkaY4u09Jx+kMkB+2esQSB9Ne/JD9RyrrNq4q+DFAkxqiftLahHI3S4KHVQE5MpiIdQN4rsggivUdz6O0pG94fIdfi57JeVcKLXvwwZEOueEO7/UlvgLfk5/0tG4t0LtoiaKVrgM/6Y/BGdFFGoQA8xvCVlYhmiNne31OkADEiMyIe+VqpxWoJT7/9Qd6iRL3ZqCPll5nfF41llMWeymb7vAh7eCvFmTjBLrGNm+Jztb7YpRX+iAljkAsOwpC6HiuvJ8zcZP1Er6tTEF3u5QNLfAwPXPyAC4HUjOIFc+Yl7FU0Omm/4f3TPRJmOTrpgwW/Pw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TvqT8mvkvtaaIomH6BBNiETLPIERtu7a11DWLSNVKE3s9OJMZgCWShzw92cqntWMlT+z0W9/zViRRBAt411dvrUigRYEygAXFNQGjkwflzUsN06U/iNDp0EZXo+VwXYCkViKFK7LkZ/ipejM93ynN64MntLC7BtslhGyu6CGdbnzZ7MS01VMMNcKe08/UnQo9dUovAVPZD0WxA6+1hVTtprkvSVO5HQ2x+KVcA9igsgxrZ0e+X2ty8j0tSqCdPogHoIJwYH6IQVysbocTEmCSq71IkO6hrdZaTBP44Xrevr8fWUeDvjOQMfmxYOt0rKxXZj9cFSa+z5V49SgxTsQIlPb19d38/6tpwS6Jt+OGcgDHWweCblPBUQSfr9liX1069VhmnVrXZzGxNHtD/ZChYwwETBP4ilkRTFe/kTh572JVsxMgcTLfrBQIWF8FCfVM76CEDF6U0xceUOYdy8+BUfYTj2rZKIBzBYL8SG/legBPyVp+GWbEW9Zl00iOEVZj8itqvmdw1KTCYC3Bko1SZti4WgXgqyACSn42R1rOt/Opk0oAw5vJDziFGJvtpjjYxuMab90pCvCtlj+/pGn9xqjnDQZGQPG0lGg+UI5kxJKiBUA+kCfKzLpBNtPi0Ez42chiDyRwKawD5eRp+uXrl0WISTzZV8nn5YoBlwzYVadwM0oEurAoya3IrTIwHFgrCWEAPmZkOwWr+RUFJSLQeKUKVV7TLCvcJEZkT4b403cbyypJ3FJ8R0Jk35Iq4YdiR42juOzQx8fCikDJf58gxstlqVQ3KV8tY9Rf8HKkCcJKjNlDa/yjD8p0Ktc5IgoHIwT4P67q3Km0UU4rmC4pRKKrqXORcFchIFoi6ad/AOligS2i0RxAzTOQzZa490qm30HSP63V5sRHNEpTxf5llcNVY4bgIGcy2WgBI3MpIwmdXzueJGH1ohuy/VuGyD/lGhyPl/y2yAhSwPy+ZVP9Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ea9c31b-005b-47ec-e495-08d9d1503ae9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 20:07:56.7662 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5542 Subject: [FFmpeg-devel] [PATCH 14/14] avdevice/iec61883: #if unused code away, fix -O0 compilation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l/XGYAdU+zo3 iec61883_parse_queue_hdv() is only called when the mpegts-demuxer is available and can be optimized away when not. Yet this optimization is not a given and i fails with e.g. GCC 11 when using -O0 in which case one will get a compilation error because the call to the unavailable avpriv_mpegts_parse_packet() is not optimized away. Therefore #if the offending code away in this case. Signed-off-by: Andreas Rheinhardt --- libavdevice/iec61883.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index e7b71c757a..72e14abff2 100644 --- a/libavdevice/iec61883.c +++ b/libavdevice/iec61883.c @@ -220,6 +220,7 @@ static int iec61883_parse_queue_dv(struct iec61883_data *dv, AVPacket *pkt) static int iec61883_parse_queue_hdv(struct iec61883_data *dv, AVPacket *pkt) { +#if CONFIG_MPEGTS_DEMUXER DVPacket *packet; int size; @@ -235,7 +236,7 @@ static int iec61883_parse_queue_hdv(struct iec61883_data *dv, AVPacket *pkt) if (size > 0) return size; } - +#endif return -1; } From patchwork Thu Jan 6 20:51:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1991007iog; Thu, 6 Jan 2022 12:52:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyeMbdQu9U4GvWv3AVn9bQKjls/BYiYEkALKI40Fa1AXmv5orEsaYgpcP0aKO0KP0kYYwA X-Received: by 2002:a17:907:78cc:: with SMTP id kv12mr5410270ejc.359.1641502333046; Thu, 06 Jan 2022 12:52:13 -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 hp32si1454963ejc.919.2022.01.06.12.52.12; Thu, 06 Jan 2022 12:52:13 -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=@outlook.com header.s=selector1 header.b=ursraxe8; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4FF7689C54; Thu, 6 Jan 2022 22:52:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071044.outbound.protection.outlook.com [40.92.71.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64A89689C54 for ; Thu, 6 Jan 2022 22:52:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TXPJCHxlXzA01P6tf91isVNVgbtyIztVVu/ykUbRllgQYtGGKBqxAAZOTTDvsZ6uS/CTiqZwZ4RQU+BuyQPrcedxA8HGIKeuEFFV9SCJCDzQ83h8/8aq4bQ/XjTlCue8h5MqxMMVksXz5TXqHtu9TyYNJfQTqWlUaRD/0K0QWF/pVypHtGyeGHb7XX04F1TzBp1KMVBry/nqNVuZANkW4CGsrGC+fVqJXEsnUM/vZRoCQ56Ezm2Z1nOu/KiCZSv2ZztM9FMEzyW22ygqS01GZ3Zfxh5D+DAHjMq2DIkGpORSD/FZeVYjyr3ZkWt2qxfxF21Bm3YIVs0/s0GiyweXew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l0lM7f3ggkVT/x4A4SifC/MxcEJ0iy8e2Lt3Qttb/hk=; b=bqVgSJrly42XDiyZcQzUZ94tOiu6C1GX6ucvs0UxWESymf+R/muvempqKMcNg2KYZSswvUMqtxGSUd5ipdzvcgCpczUtzRefTaeaj9tVMsSXdZBR/AtDfp8aNy16Lym9dVy9Uhj53wovEbhRRmXtxHxySKfMlqCkY1si+kDNWNSaOXWhOwRXawzJ//n4zYqI3MYduxRU3wzo2v7NQKr3+/iSgC+Q+M/TALiwTQ+yKFFKdV+obFQnGSWPhzzTi3pCANCpf7+ka5r+bHXLd+SCLAm2qeYdeth1i3yBkFyjHqYTszMNgH/sf6grELpPtwwpBQkIsk76PKIeYMvBS7KmkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l0lM7f3ggkVT/x4A4SifC/MxcEJ0iy8e2Lt3Qttb/hk=; b=ursraxe82gbsbWPHJvOgcgRAUvgfjG8WGx2DKGT3jB1iYmFeRDvW7IqAvk8ViaEjN+vP1A8jst31n2r9lsKDLsRjDAbr2Rk2GRxA5CqayobGOtCT14ubj6RuTCGzrFGcQsG82oUDjvFCifTmU1wwewvV+j0yk95iPZAlJkF1a1a67XfrMqveyYo+QN/vREwDM7V460xN4eSVTGSUcpF43ZK9HwsDbnV8i2lW7iBpjlPupF80+X3kmVPNx6Tp7fpNDgsU8sEWkHjUz7sDQNF9Ug91Lnsf886hdmRYamfUDx72/mxTxAjHN3vj4BBhonNpJMMJbV1j/kYL2AUL5ykPSQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3092.eurprd03.prod.outlook.com (2603:10a6:206:19::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.16; Thu, 6 Jan 2022 20:52:00 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.010; Thu, 6 Jan 2022 20:52:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jan 2022 21:51:52 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [M08BRLtbUgm/XAkkrL9GOgUPrIxbPqm8] X-ClientProxiedBy: AM6P192CA0092.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220106205152.2625727-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05001e52-0e33-4fb1-bafc-08d9d15662de X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JjOL+I2z92Bm+Hb6iUFj1s61CVE+NYjAxITP91tXq4uxqJSno20POj+2/BTgqImCAWd2MMoFshSfYn6uou5y1jVe7lPbEMnJBzgTLFAOWkeOigVikBqKUpWhRpL/hAA0Zlklqk9W8TONJqkDurinSLoaxXzgMaj6b9uNWnwSLTduOvna2M9ES3djUkQnWS0lZ2roVyo7dUGRJ6KEUFEAPMZ4teJPy1/8dny3iweNS0b76Hx4royvCPbUgF4fn65BqFNbpaaZm42lcFDGx8DlzlkiuRvJ0RmocNfW+UbXLaQJ9uUDqrH4wk6kEcULhgmPWHNXYUBaBmErqqgdmDXNnMjqP4jGnlYCEV9aSDXtKlwu2Opw9No+/ph09/E9Wqpgw9t1wQiqOPLPGu4zvEWyx71qgKlUw7AuBFKdyr3u2o5oXxfmguyNyfPBtv57WaIClEJE1d14led65BS7Mx8le7jEkcB0HVMUxh7BNs+taqjSfJjZwgaKtbLF24pnGIL2GZKMbUZ7n6CfqAP4pVHyn6Hg6U6UQVf+papZAGtlc6Fvn0NmQuhiDUvk3hniCkpgQYkeM/wgeZNzY2MTS0Bi1MV1GF39nhKejWnnQ9/65BAeizbJ2jJHHWzCKizt37OrLnUrWsuxEJ3Gqi2KmACIQjuoOkiD1V+xsv9LRVlW0LhMdxdb8lIXCvlHxMar9m9ClhXWJH/C3HlVn2rT376QIft6UdglDZKFtPnUFQ61x6LM= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s4c4kZHWTiooJGsPu9MqFA/6eIVozS0YDSfVgIRBQ5sc6PpEDsoMHBLMWUM3sHxL3JAgczW1ZVphxpel6eLj2sUzsQV50fhrbh4tf+EYtVgXUyBI0HA8WnYvbdbdJmDGeRqfm/ji7y5VSqwnNX3SPWfdhxSPSzwzPTJjyFHxPHe4FdUJ4VpZYUzTwiZRg6eqQrr/4FWHT57FbenFS+lUMR+ihyna4KvxZQ5Qgbvi82Ki6O/xLJHgyNAdBZhAfTEl+y/qTAR4JsDW5bnbU6kPzodKkwXpeZEWboUxQ0HGK6iChEWWANBYHkSU+eOHNiPsX7tvATXESdcRjqFCp4LtQT9WXdQEBf2S2XXioQ84hs1X6cMWhvM9BdLbjbKfjrKko2KFruvh3ZVi6gYr+fnj2286bIEtTtSNmrUk/sT8VxZ0iSEvkmKWYYmF70YSm0Yf8mLRrqc1WyOqH+NIUYx3AaaNPxpsaFUQtD+K2fcZqM8S/UvaFOKsdNljom3Ncvh75OuKvOCkbY0AbNLblRv6ZYcMcJvSqb2tQKyQZRmPj2VQntMx1T71JKKUt+dnxSRsD6zMl3pOegcY2ThFsAl5hw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZwBGjx3SZCLcgHtFIP2pWDOr3ZhnzGHHREGsA0bDpBtYLlUeKOJUXl0EZKvX6hZdHcKbaqqCXC8tUMeojWxtC2fqRjVtK1xo/kWYTI7EQK/m1Hbave6O+WJWhvMthGSJdPb7Qm9UWhHacx7KJqfO+PgqIG5FsUqPphkPb/N4UwPt8jKq2bMYTNZ1LfO3fYhYYmWL+YC6ZEUKZ+Yw7NyYprwx3iaogWaXVI84i4/+7radDdhP2TidFjUICi6ymQl5Yxu/fsLbLrRmEF0C8C5xFHVASh/lND3FLiUDbghLlMsK5xnxaLW204dZaggvDKGi94jQ0rQx84QKO0RHZAPC3MryU7gfylS7q4XlSb8WmrqGJCDsyAsWx2hxZb59llG2E3VPDJtbtJIXIzPZnsS8+wvN2G7D5MXJpFm5TVV7Gk8fbo6pWKDfHQODTTP+ZjMCDzcLJFHHPYg7dSZtXMEiWM60T1YHqgPe0zC1HoEBFfY0uulJVMIBpdM1tkqQMMiII3TcK3ZoxOmxfWyig8z1qKOlzCORhfg7FovEU1b2HTirazCPz6+ZM5ipSYrmhSJ6en1TKjSTplt59Y7VXXV/jZwZh+ZQdz8CX+rkq394toAQ7GLY5BE0Lz8a+FCAB16odLudRtRODrrrX9i42vMDJsdPoIgmtVuCMxcmWEafK1/Gyk1WKqf2gs9dpTmOHby4GM4ku0ZOdZkzv5klu+AUg3gaLBi0WE5sNeRvBMQXfouAxNxfgbmdAug/yRvAa140iZ+7QanOpkc/wyDykh62NgaMMoTWp5nMfezdDwSJTTIfsnRmmcbhpKLO6Qy4+5hewkpKa77iOhnvJMJdANKjEiNqxqPoOb/EcMldMQ9KtT0ICUwG63yvr2EyC4jLsVYQp+oEti3TPyNhWE1Yt0X6+lxT+3YkfYdOR43RuUSFNbKsmTWxbvFOpF6TT85lYvF36M0dQ3IR2cWv5XCivkyQuA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05001e52-0e33-4fb1-bafc-08d9d15662de X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 20:52:00.8292 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB3092 Subject: [FFmpeg-devel] [PATCH 15/15] avformat/img2dec: Don't include disabled demuxers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SFvBuPt7Uyej Signed-off-by: Andreas Rheinhardt --- libavformat/img2dec.c | 73 +++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index a6084ceef0..4d5ac51b53 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1130,7 +1130,8 @@ static int gem_probe(const AVProbeData *p) return ret; } -#define IMAGEAUTO_DEMUXER(imgname, codecid)\ +#define IMAGEAUTO_DEMUXER_0(imgname, codecid) +#define IMAGEAUTO_DEMUXER_1(imgname, codecid)\ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .name = AV_STRINGIFY(imgname) "_pipe",\ .long_name = NULL_IF_CONFIG_SMALL("piped " AV_STRINGIFY(imgname) " sequence"),\ @@ -1143,33 +1144,43 @@ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .raw_codec_id = codecid,\ }; -IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP) -IMAGEAUTO_DEMUXER(cri, AV_CODEC_ID_CRI) -IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) -IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) -IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) -IMAGEAUTO_DEMUXER(gem, AV_CODEC_ID_GEM) -IMAGEAUTO_DEMUXER(gif, AV_CODEC_ID_GIF) -IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) -IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG) -IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS) -IMAGEAUTO_DEMUXER(pam, AV_CODEC_ID_PAM) -IMAGEAUTO_DEMUXER(pbm, AV_CODEC_ID_PBM) -IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX) -IMAGEAUTO_DEMUXER(pgm, AV_CODEC_ID_PGM) -IMAGEAUTO_DEMUXER(pgmyuv, AV_CODEC_ID_PGMYUV) -IMAGEAUTO_DEMUXER(pgx, AV_CODEC_ID_PGX) -IMAGEAUTO_DEMUXER(photocd, AV_CODEC_ID_PHOTOCD) -IMAGEAUTO_DEMUXER(pictor, AV_CODEC_ID_PICTOR) -IMAGEAUTO_DEMUXER(png, AV_CODEC_ID_PNG) -IMAGEAUTO_DEMUXER(ppm, AV_CODEC_ID_PPM) -IMAGEAUTO_DEMUXER(psd, AV_CODEC_ID_PSD) -IMAGEAUTO_DEMUXER(qdraw, AV_CODEC_ID_QDRAW) -IMAGEAUTO_DEMUXER(sgi, AV_CODEC_ID_SGI) -IMAGEAUTO_DEMUXER(sunrast, AV_CODEC_ID_SUNRAST) -IMAGEAUTO_DEMUXER(svg, AV_CODEC_ID_SVG) -IMAGEAUTO_DEMUXER(tiff, AV_CODEC_ID_TIFF) -IMAGEAUTO_DEMUXER(webp, AV_CODEC_ID_WEBP) -IMAGEAUTO_DEMUXER(xbm, AV_CODEC_ID_XBM) -IMAGEAUTO_DEMUXER(xpm, AV_CODEC_ID_XPM) -IMAGEAUTO_DEMUXER(xwd, AV_CODEC_ID_XWD) +#define IMAGEAUTO_DEMUXER_2(imgname, codecid, enabled) \ + IMAGEAUTO_DEMUXER_ ## enabled(imgname, codecid) +#define IMAGEAUTO_DEMUXER_3(imgname, codecid, config) \ + IMAGEAUTO_DEMUXER_2(imgname, codecid, config) +#define IMAGEAUTO_DEMUXER_EXT(imgname, codecid, uppercase_name) \ + IMAGEAUTO_DEMUXER_3(imgname, AV_CODEC_ID_ ## codecid, \ + CONFIG_IMAGE_ ## uppercase_name ## _PIPE_DEMUXER) +#define IMAGEAUTO_DEMUXER(imgname, codecid) \ + IMAGEAUTO_DEMUXER_EXT(imgname, codecid, codecid) + +IMAGEAUTO_DEMUXER(bmp, BMP) +IMAGEAUTO_DEMUXER(cri, CRI) +IMAGEAUTO_DEMUXER(dds, DDS) +IMAGEAUTO_DEMUXER(dpx, DPX) +IMAGEAUTO_DEMUXER(exr, EXR) +IMAGEAUTO_DEMUXER(gem, GEM) +IMAGEAUTO_DEMUXER(gif, GIF) +IMAGEAUTO_DEMUXER_EXT(j2k, JPEG2000, J2K) +IMAGEAUTO_DEMUXER_EXT(jpeg, MJPEG, JPEG) +IMAGEAUTO_DEMUXER(jpegls, JPEGLS) +IMAGEAUTO_DEMUXER(pam, PAM) +IMAGEAUTO_DEMUXER(pbm, PBM) +IMAGEAUTO_DEMUXER(pcx, PCX) +IMAGEAUTO_DEMUXER(pgm, PGM) +IMAGEAUTO_DEMUXER(pgmyuv, PGMYUV) +IMAGEAUTO_DEMUXER(pgx, PGX) +IMAGEAUTO_DEMUXER(photocd, PHOTOCD) +IMAGEAUTO_DEMUXER(pictor, PICTOR) +IMAGEAUTO_DEMUXER(png, PNG) +IMAGEAUTO_DEMUXER(ppm, PPM) +IMAGEAUTO_DEMUXER(psd, PSD) +IMAGEAUTO_DEMUXER(qdraw, QDRAW) +IMAGEAUTO_DEMUXER(sgi, SGI) +IMAGEAUTO_DEMUXER(sunrast, SUNRAST) +IMAGEAUTO_DEMUXER(svg, SVG) +IMAGEAUTO_DEMUXER(tiff, TIFF) +IMAGEAUTO_DEMUXER(webp, WEBP) +IMAGEAUTO_DEMUXER(xbm, XBM) +IMAGEAUTO_DEMUXER(xpm, XPM) +IMAGEAUTO_DEMUXER(xwd, XWD) From patchwork Fri Jan 7 10:53:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp279207iog; Fri, 7 Jan 2022 02:54:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxS6MuIeUzujLFgkZMfXjyvAPPQhSc/0xN2aU6DXBVWbqjuJsSKBvd15C3/tnRWw49xj1H+ X-Received: by 2002:a05:6402:491:: with SMTP id k17mr61563945edv.333.1641552843381; Fri, 07 Jan 2022 02:54:03 -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 qf36si2759502ejc.638.2022.01.07.02.54.02; Fri, 07 Jan 2022 02:54:03 -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=@outlook.com header.s=selector1 header.b=bJFCa7k0; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D30CB68AA82; Fri, 7 Jan 2022 12:53:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067033.outbound.protection.outlook.com [40.92.67.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B31DF68A1B9 for ; Fri, 7 Jan 2022 12:53:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l8xcoGsQ3WHe3LymILhEfBABIL7huSfZE1Ff0fcz4M511+iDyE9oKRxvTo416HVM0OPk0XextKMY8Met2WnfZu7sDqF+FgJBCI2MrPxwy/XzxqeSV9aM7BS+lPWHSlnTC23RSS4jlJb3HIknAuG82OkKDhQZV++17lzg7rIkS6LHuqXDFGmNaMGs/C4R0G6zL09vG0GAo3O8m40M3g+4fSLuv0Dcneif7xIolCg6HwsZrBK9a35nChUbUWw8ySpm7G7CKLctOE6hca6lLXIAJ1+g4rTYIoAqAl+ePX2bpTHxhnrD7VjLiWXkDVSHmA5c8674wA8ak04I79TZP/2Baw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8qkeDhPiEyl8pRtj6x2MKOViYtp9IK4Iw+NKcp2fNns=; b=Tu7s+9e3Bmy0QZyuTi4g1vvd1PJwy+nVhPbjNVXr6CL48zW1J3nYI7miiG3Kso3SYnreHVZNIZFUXzAH8Ys6ulreGqklOBCUTyjMcnCiU7vT8TeFKUrxWtLfxafvPMEfYy61mMcAd7fQrNWbV4UMFnsuOSVJ2QIUuZA8KCu/G+skhma8k5hy02oMY5X4Q2/phpnf9gqd/bH1eB3QwwBNv9734Ai34Xj58dfJwyz1E5QEXIMWZSivByJudkYjMbH61AXwqV0Fuz7c20tmdM5+uVnjxuvhcOwbOJP8Y+R4DbdjVKXNpAPW0nCYDK6+690VMvWt8SIU+Pcyr0NaodUgBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8qkeDhPiEyl8pRtj6x2MKOViYtp9IK4Iw+NKcp2fNns=; b=bJFCa7k0FWe0qvISNY64RrK5MkZNa8cPzOv1WqyRhyWhwTg4pd+T2voQPiSmYeIouGnpzFgsQ9+bBuUoOdCoE6VLjG/Q5MYTKeLD1xYXDPR9Fl8edy5bmH3rS5t8Ak0Mf3dxd0l7CrZ+1tcYxYfXUXdS2Go/zIevr7kiRkTYWu4LZp1sey7utd1PaDJRnyCRJg421g1mseplVLihn19qyfvDdild9OFgQApLF9gvuLr6pASMJ/oCS3kcL83eeqD3+6drtDlmygoj2gL/R6O0FgdmZOc921PJC5HnzAaS5FioXFL/QOVJOFcvmb2R0Zzo03fmUgME34yhQlYmAnsgAg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Fri, 7 Jan 2022 10:53:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 10:53:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 11:53:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MfWItW/q7DviAZ7Jx58ArjcynAc1WF+W] X-ClientProxiedBy: AM8P190CA0025.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220107105342.3241608-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27581172-6cfe-4c57-28e5-08d9d1cbfc75 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlridfjIko0CxIpBKC5Bk3h9Qpe512HjfavbAPegnOTbDRXOeGup9fOAu+M8rertFu68a+4JRxtE/KTdkrK6Gu5w0PF+vpDLdpHC1JLJ3nNi1W8RjAseZ25Gm9lqiM1LSZMFrhQ4ptGToN9+B0YlkQDudT5NZHhc4nz8nKJaTVMDqX53+ZXcda8Mei+t2nJqCQp5UjeSSShQnQAAdjVk83H461Y8AmwV2BzKbgWOkKMTifygrzXti3Ip9bbHpBJx+UBG+/pxX6b1mJNubXz6GL+uHRTfW50dJiK6ydNBwVF6rPqrG6Ujl5hza9eEJ20/B4+gH3vMdnv8UvuNRlsapN9I1ief1Kl10GXvJdp2XEs34h6Lp4dc6xV0jhpjkuD1PhP47aFsdpcsVVC7SPC0Rs5ueYX+nHNjncus5dnPFuLcmqgieEMmgthwx816yfoxoa8DZqvD2v9pQngFvHAzM6tex6KHtpl/p1B5a23hnZtxvE6dwTp74y4lpHPlieRfzYl2DV3M8ZO1eDfp8SOno7YXb7kQWhieXieMS1WwaADzn11hJjr/a5CIagoFQrppePiwZnrGrR1G0NjCrIj4YIFAwB+/lRCP6wz6xEtddIm7HS13w3QVQxjs8phCo82aL5yfHYoYWfoex9OQ3RP65mxVdFAiuGPD4rnsL2AmFBGAhEBjOmrBbrINEvWi1cRr1Xgk40B0iyZa4= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dMP6MhKgr5PG4R3HUBpNfTE3c0+8TkqMYFKnWHwlVAF8V29S3dKbEAn5GXBFueeZ11dHbDfBqIIRuVYqDYWaaNECRKgQapyOfU6ugB9/0JyR6gUxZSRriqGeOw7ThLc5v6qMS3Cgf7pv8OFLQBHO0Ae5ewDxpKbPgvK0Um0LPcq/EUa0n4wQBW6IsgN5KzrFzsJLVMlbLVZN+YF/CQJYlmnbbfkRV0D9hi1TeEg0vWXSgkf3nUIBjA2XjxNH94iCJzf9NI9MrQajrypKAV0Tq0GnQSEkWtQxH5vwxsMyz0OQLuxdt82zOH9cRlFVqbq9pFmA0OQBNhh8bi7z4B2xZ+eNrDy+gi6Mv6hcUyQQh621g68iYGXE9VDQkOax+Fns32bTn0cWEpWqa0yzEd9vIvEQ2M4ws3sOC7vgkV7tMKakhkDmk48MIZXkf/HsXbv0w89ZUPFnfBJgsndGuPRELPIW+ugwRgpnnMoCustXJb1LekxdJpkrXc7eHR3HlYBfW2crRm3j/vA85qj6fyg8Gqe68wXz6p6PIMbflQNaS5jmMHkvcsY3CrnUXJX4Q9yUqxd9O8ZbzXfeErx7RkERtw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6lBd9Lm9waZQ6fI9NSHO3GD55vDscSDExKCvQppaSMbLTutwEANhOW9jirOxQ8yWbnbyMV7DoHcldWEWQeulcHw/zw/8BysbS+7IBX7PGeUktO7vGf1cduEXBgjbeGCEC0xyp5jWaqWRYPLh55JVnYoXugZ3YxbdZII/TY+OSXYWA51nfYKSa9+XTvCgMFZtFArIFdae/FLydmUtGz8WJvE3kMxy2Lf48If+HxfjQvF+w4PZGmmCH7ufdKkDdDc4wMCXB5oIOqOGgwFs/HKcZwqtbPQ0Sd64tr6FWe2im1RHRbETeaZXijia2EW96HPrJdGF/3LoZHaDCvnI5hwf/N1volsid5QR53YDpV+seIDfJZ3/khaf3ed2jjvVp8fDuRjq9EPPLTlxWbnSDubjqjW8siMPg026oeZdMfRTStznwbW4gzqYW1djV4tUyapQ0ewUHWHk+4WcRa52OQH5TbLZtP13n4ya7pzaabUHesuXEpYpNtDt7VbtE6UtD07scP6UM2g8GpM06qbI0GVvx/6MLFi5K0QbEruYLklQMf44s7+G1ftLSFPbhqOp3g8IKFNBgqD8Ycd6AifZlgKwYTlPvVMmIw46FrWyA/nivmty2zu0B5wdyZRvAwcrIYqQ+ycIN46FyYdsZnvt+UPm1ehFZ38Rvc1kFNkUZ8o23gQKi9EaWFthqk2FKd+CzFW9NvETXZJmKFUipMphu0j0/Ye/rfME5qCxtnzRLB7MA584p2I3ngYlPj5Vz/8fH182jw9qxAV5tv76VSQJPwVdBYoMysA2cdvTx1+xSk3y57uLkTpjG9WWBGITd/ypGeSiEgA3eu2+TJQVFytBx4iu2ZZCBSaPh3UQpdSyWH6LHu1jEiCMiDpM6qUdHRcNt0A0/VbOA2Qz9ZIDAX5X9avJCYp+r10gW+DVxCzRwbKUiPCYqNFIQNDC9e+DQyLo+7tKwnFtLqI7oJghuvK5qK/RBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27581172-6cfe-4c57-28e5-08d9d1cbfc75 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 10:53:49.8268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 16/18] avformat/matroskaenc: Move AAC extradata check to other audio checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dFqBl4cKfwdK Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6ba1dadee9..303aa1ce50 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1173,13 +1173,6 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) return 0; - if (par->codec_id == AV_CODEC_ID_AAC) { - ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, - &sample_rate, &output_sample_rate); - if (ret < 0) - return ret; - } - track_master = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0); put_ebml_uint(pb, MATROSKA_ID_TRACKNUMBER, track->track_num); put_ebml_uid (pb, MATROSKA_ID_TRACKUID, track->uid); @@ -1377,6 +1370,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (par->codec_id == AV_CODEC_ID_OPUS) put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); + else if (par->codec_id == AV_CODEC_ID_AAC) { + ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, + &sample_rate, &output_sample_rate); + if (ret < 0) + return ret; + } put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); From patchwork Fri Jan 7 10:53:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp279285iog; Fri, 7 Jan 2022 02:54:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKRq9mYwD7N9oe4fl5aafZAZ88l6l2kT3JdJJ+v9MCNG/Xyc+PwEd6+qsVbB2sXwX7cxiX X-Received: by 2002:a17:906:5d08:: with SMTP id g8mr47572905ejt.710.1641552853345; Fri, 07 Jan 2022 02:54:13 -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 m19si2798097edc.481.2022.01.07.02.54.13; Fri, 07 Jan 2022 02:54:13 -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=@outlook.com header.s=selector1 header.b=Evioju8q; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E134F68AB1B; Fri, 7 Jan 2022 12:54:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2043.outbound.protection.outlook.com [40.92.91.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4837E68AA61 for ; Fri, 7 Jan 2022 12:53:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d12pzDwAbLneHpNxiM0qOqan2HuV40Hdbi76bntj+J/nfQyScOF/PA2UpaVNtQzbMtJd86ezlS0baSbPk0ScEwkUINHMhMEJ6GVXChB4B/XAUJ70VMN2/gju7OijzQ8M+Q9inzDLzrzD3FGV2MWTlUNCspbPVxeSRAZSUM9EmhGZR+cm2tymuT2hGq0Cs4xf7Scz4D3aduj2j9lWZaTFseSX2UEhTNk/NZ1W98l5zPKydqAZ5JjhMqZZxeU4crn2NiZ0Zcob24eq595xjS4Ix67aIcWUbzSrvhnhKoq6ZnpYH8FuQM45153nhLVc9u21v6zSXzWhKWmuuhNIn2X3pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UEgiRUTkMo3g7ATmPT3LG13CUE2JeMwvK13ZlC+6gaU=; b=XH/mcjQgCyQ7p5fLIHmjIbdHqCYFZt+a8FgtiQ7VedjpjDYRUCGJCljFxs3sNumKKEyeRzX78w42oXHNlzKTNUxGbWgPwk4dV6GkbEoi58wPWo2QEuM9HgrPuOBBsJhUHAVs5anmmgZKrc4o2GtEvymxOjtt4IdqT6JcX65JxqmLE9GuUNIr7QVlY1W87N1ZaBjs6n6HPqO3ZPIKDxtpN6sHFE9vfU/CKg/FLSmSmZ43sw9xLYb+R47yyJzYeEEDlaAY6dcc9xpHSiTPxPjH5j30SvZYZAFJVgthrlI6L8+RbfXQcyGDjPR4j1j5oCusdlvEXW91v5ME5MOE78/4cA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UEgiRUTkMo3g7ATmPT3LG13CUE2JeMwvK13ZlC+6gaU=; b=Evioju8qn51RLgN96tGZosS3coj0I3MNV5BSoKJgKIAxCxYna/aEGuZWA8PeVDcPn8TE9vbqgaAQMjubsVdBx22HayN8zn1n9GnBe51i0PPyKIlvtOcAKh2mj/vjYuz6/CMiY9hapPqSGdyA32uTCUfeUKtNfzK14On5I7ZMxfaKjiPIpuFz8DB68/DTuPyhbS64Gf+F/vOY2IhNkIpnA0OEwF1evqRuUU+2fSN27j4Vo+mOcUCzo2Y8cROL/X6PwZPvHliPktce0claHqzaOlZp1oS41LW+czQa/d3qtlXsKvosVzP3TVFtYysZEGT/tbmpMIGjupyNWlvCLqIsHA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3239.eurprd03.prod.outlook.com (2603:10a6:209:1c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Fri, 7 Jan 2022 10:53:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 10:53:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 11:53:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [U653Xf+z1zRTE44mP1Vw4wM3G3i1iwNr] X-ClientProxiedBy: AM8P190CA0025.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220107105342.3241608-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc3bbe05-eb25-47cc-36b8-08d9d1cbff02 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlZcSe/l9TWxMFZU9OEmkzsCvw2hwDszr+/M0c/OLdE8gbe/fxNZ40lxfTYAjO/JSA0Qs1xrgijAlOBOObmhHQ8ahi8GZtxcHdKaSfuu+fODCOLg+U+yFwUh7OoT56rK8ZteIkXVXed7vcda9zV9O5bIwi0rOrg1sD3zGjFIae+EQVkcWzghCFpzzK6CDHrPq9SWoO9JsdPUikKSLOpYmveG8o5Bhzd6K8FSshpmHjFwY20p2jjBbl91yAKLdiuk/GsAHDTDMQzQyHPMewsra94v3wC1xh65VhF/3ML1X1WqC8Xmd2Vjuoytw4ylXgVkl3kLXYbAoRSPFNZ8KGVyETbwWqz75RSFOY0Yp4WkTaql3JjGF4PDXM/jnRh+YdE6GEzlqAGUqCIXBLMlUSgirYG+d7UWR2C9PRbEMmLC9dbHVS27/r9KJsYp8ZlOkWLaI+Wr7yrgRa4YE2+Z/fwvEeqY2s24M2hZazVEJrkO5tZBuiRFUwnmABk+S9zc6qNnD44fKGBAATVEsU4TpVOMZhSfgVE53K+7VNlpnuOPa1Dan+3eeOKSrU0ajb9x4S2QxnsbME5nlstnqTbat25ag0PVu20GWI+S42JdxYz3YDyjbQ3jFp6J5NBOaWXGe0GtBGXkygOc8R02cRo8z2d9Luw5aTXbjwx9rj5RGf7CpzPFHLveCGb354VIDkbVPyU68fvKNyMdxqw9c= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LqMAhD/fpOrPZDzTs+6RKt3KgPjvTFyq37nzBidJO6Zc8PVCIWkoWsiOcFOTY8H8D2O67q1buo61CuP1c/k5rc2005B2gH2dbML+7dg0NhCnSLeG9aoTHk7PpPgODnITOedjxU7OLOsVGN0qlwHx3h8vlEr5MEzn6r3wI35E+Mhcuw4VZRD9n4gdLbi13MeCGeHH4oDqcWB4yu7hPNBVq3KLQgSJ2lRid9byS/AICjCUp991TEE5tr0BiK8s0EnsEm4A7Pdx14e5W32LRL5Po+bbVQfkjWEkgSzhLgasGwgd2NQHM4qOO/FBaYGJNrrHs7y9pMDSCVZMKsotIfVgkvdOi1eEOyuraEIe+Sn5MpGZ2H0EqMkNFyDdQqW/VR4eCFzlLs53VtrinLhZ2gFvPVXop3AzvcuNvpsPakVfEgsQkkuCOXS8kOAmhX2mP8yvdRADU0y2qGKavc3RjTwrTbe2swOYo7n0l1/p3pCRXEyDJ2R/GwVvEK6l04fvLcpDJPctSc46QjnU8S2EFEYk/xtv0KJxYeBSJA9HC2X2AzQRolVy5NixUZdWvu/CK6RFLiTnSL3twQ08rL7QqksSfQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EwbjqwETYVUsEO0DHUOc5bFxVcI165Bx/2lVrhRBiJcLBiqB4OkoCAJZ5RjCISrTK1R/jn++WfwE6uRElrOVWP/baQqnpVHV+kZ18Xw6IG+kfLgfMj8Nf2fokzooWWSB/kgNbXkASqYxIqEWBeK4qWP71M1Ts/0kOB+nFJV8DoMzxCRliiTFMnEwA/F2sLg6yfA90F6HA/a9otxmTZmE4YdHNULzixdSfOV85SBnzBFW6oPg1PxbP0X43YHTfEZsvelHNV0Cst/1FxTuX0nZFGPCEgnOCr8PCJMTw5dfkf048SW/wSIk2iq0sLx8sX4WsVwshK15cT4KEkEeNJX4KD9Jo0xQTJB9668/opUZzgIaacAPbSgnBtAypdGwQfC3v3zYWvDQN/LTZBQLKks83Rsl/Bh/5WrBHe67WavO1lpKAI9WDbUSSdxq5bNjDwtQGFab1RQHslWIpVX12/wtU5eMStfWwT2MZO74IHboQkhS7vmmboQsXqoUXIAujS2Grl4FB1nrz1s0ar2eHObuO/ReZ3vHd6+6bczf5qSaa28d5EYfkxH72jLW426EuUCX9an/xeiW+y2GRBFgMZJC4zzQumV4EBYl7xcli6Lw8whDImPDkKKUrFjAc8PLPMQOwqASd7I8kqMZPsqstCzFhP3kQqhOm64SzmrFH/TSYV3zIwk/rz8CN5i5AC3ODcwJnFnXINK6UeCX+X+5ILI02Ift6AKsNI+ZyYajrEtvNZwoFOcO77HrQDKKfy9a/k6bMQ1p71TcrEeqokBEl3e9H2ubwRHdCMJFWVh8Ez6GNHYO21LCG/ZxjqFzJKWoHDPm64dcftK8SapPJiJZ7Wmu10V3ES6K85MW9c9b4VQeajzGrnlGNqT4B+39J/Ig63djlcdRKH2WYINpWHWx9LGX9GoGl8AUhpyg36ioGnVGdTGUkT6M4m9kV6lrrSaLj6I0SZ3M40yBIcZQrntN59XxJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc3bbe05-eb25-47cc-36b8-08d9d1cbff02 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 10:53:53.8255 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3239 Subject: [FFmpeg-devel] [PATCH 17/18] fate/subtitles: Fix check for fate-binsub-mksenc test X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uYnz+kByROmG Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 0c89adb0d1..8375cf2898 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -16,7 +16,7 @@ fate-sub-ass-to-ass-transcode: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/1ede FATE_SUBTITLES_ASS-$(CONFIG_ASS_DEMUXER) += fate-sub-ssa-to-ass-remux fate-sub-ssa-to-ass-remux: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/a9-misc.ssa -c copy -FATE_SUBTITLES-$(call ALLYES, ASS_DEMUXER, MATROSKA_MUXER) += fate-binsub-mksenc +FATE_SUBTITLES-$(call ALLYES, ASS_DEMUXER MATROSKA_MUXER) += fate-binsub-mksenc fate-binsub-mksenc: CMD = md5pipe -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact -fflags +bitexact FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub From patchwork Fri Jan 7 10:53:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp279370iog; Fri, 7 Jan 2022 02:54:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0mTCIm8N8hw/uxu2YQQGNpNgt3gp1FLrULMPBX4en3+HwpL2rViOAn4+YT8/0XLssJeUb X-Received: by 2002:a05:6402:2709:: with SMTP id y9mr60421072edd.346.1641552863398; Fri, 07 Jan 2022 02:54:23 -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 hz3si2628934ejc.129.2022.01.07.02.54.23; Fri, 07 Jan 2022 02:54:23 -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=@outlook.com header.s=selector1 header.b=obgHtybU; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 102B068AC14; Fri, 7 Jan 2022 12:54:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2043.outbound.protection.outlook.com [40.92.91.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B39068AA6A for ; Fri, 7 Jan 2022 12:54:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gC5rrlV3RG5fXbEAdZsneZYUrPCn+VnkG3Dl1s2lhBONs1dMSSYBXBIK8LQmxe7JN9XowKYI65orLwpuoohVHfbgXaSJMKqxjAw3rmP+rjoKOAdOuoMImW+rh2Wulpf6/Uc0D2ApVDlNIdBqG9ikIAyqmd/BmvRU7UrzS3y6eOvivYqsUGR4h7jSaYNZ+sfZeUIUBd/0JuwOx8h7GnmriIq0jxeHKKL6uOie9FCeGGfZI6tU7EUyoVDDMXZvOeOY80NCOMi9zZYdedzU//+VH5K9hBG8JRBsmUC/HqbyvsspSu9ARXiBUStLWo17Iryv6FDshGTKM0xOg6w5rOm9+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0s8OwcUgESYnkZfrLx1DVeY/Xx74yt/mvImsnRLwQn8=; b=KAadnqWnS138vUA0Z7/j8EhCF3ejWPuuv9asfOl+AfPV+gEN8Oay+swk+6INb8mFimgIxOtiMHgilp8GuzFp/NowlcI1KEbSnjW72m39YUhm0LhOKyd16GFI78aX4JZjjV/r20vTdkvSMS72AHrQIP99VlXE2sNsyZv9ojmLcbT0x996wGcHpiLgCz6mJ3gF1U8GBToDA6JDEWbTi9pn5cBGzaihyzlZZy/q3dCTR0aTCTfSDizQCI5yFqwQLpYkaHQlPHv9VaZEUXeovM7BChtmy/ACbMk7D9GbeWCDf2zinZCAVQ/Tk5ezW4+cq3vdTu0JbWpppAmQHu4d3UfRxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0s8OwcUgESYnkZfrLx1DVeY/Xx74yt/mvImsnRLwQn8=; b=obgHtybU314gDgEH1+UMzWGtANnttvQ/8ZXtvFluM+r4LF/0nkPJIwgjedBb86NjfxNErs9p50MCoKhxkBijba01PtAsT9r/4yNbC8PjPJ/E4XxmFfQ6BFkzea9bVZstfT/ftQM3Mw/74TGXJJI0dpT3N9am39+TRA4ZyeQjqNaen15454Y+LE/N+6aCwmEMGCvEHTUMipQqDrmNVfbTsQ+JpDu9zNOl5zC+olD5c7/cMWyCh8766wprrx85RnzRSXte9OUvVqwHniiv8/BjUjYBtmpwxlohZ9kRbEqTRj72ADyMsHIs1kq9fuVixjNuGMkG7NmC93kSf0bJIS6fNQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3239.eurprd03.prod.outlook.com (2603:10a6:209:1c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Fri, 7 Jan 2022 10:53:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Fri, 7 Jan 2022 10:53:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 11:53:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [9E5Cxl+0lN5LDAs1E96jHfPQi6gBV3nE] X-ClientProxiedBy: AM8P190CA0025.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220107105342.3241608-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c95d8fc-0ffa-4ee1-5709-08d9d1cbfffa X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd+hW4gLxOsJl5joX02ZNnAyztcJlAt63R+ysbcAzuPYqXVKumXKrs1cRQlKAiRW6xNV6CQh51XsucsmYlxgwrkylwjLRgx7yelW1mTnAbtlhOMf+7+Z/Vaf3FbOqBUJSRbhLbMgZo3L0sjT9KwD4mhuMspingnB0Rk7cVI/qG3v94eLFxbzACY6CsqMn+kCymkOis83yagXLULI/m8gRDb7o0Yy7DiYNY1/3xJ6BbDBZixrchkKKF/88OgQIcw79PIWM8v9ZvQegXm8mcKk7yypAoL5WIPyqlFP+TBfXSPYBbUxmaCNaw8V+EvSqWDSzTqMR2l385DVET5/eB2RQa78bA7GOUGDkjfqkRscSHL78L6QTgzLIq+kD6jQp6C34fFqJZQSyq96yLKyUPhtOkphsgV1J8+kK2y5YbG5w1qPuTZwx/e8npFrli5xpoPIx7SfKYvegeuAVJ97UzGoCofoRT1fGE+xCRN3o9DUs2MEAQ4zwlZukPN6heU0Z1uEYlXxCseXIf7g1rVhUVJz2ihWC5/9ATDqRXSWn6VmHxejz2wrJgg8Jy5VVyNOTXFQsZKnx5mzR85lJQWRGfi3vLXt90EZ0pEC56lEurVZUVOdEUEluE95gjHQIXk91rEVQdDJf8fKvTO20v0y8TxmoPvVwpOdgjOrFksQkqjwjv9O9+oRSneqgmkmkMOBkLC+mXkvZ2+ogrFNOb6vZ05M7fpII3YfBwQI7F4m+/ycfoVO6caT42GGOYX36oRo6+q48Hlo/6Xt19YXCAj8emY0ZPPrqKYXqDSbDf+6W9DxWs1dtzZKVFBK8gxF X-MS-TrafficTypeDiagnostic: AM6PR0302MB3239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: usV4EHDmoUN/vwz3MZX3jPBClZCr5tVhLddzcNx7XfIAqL3R3mh4N+sHHFFnmeEq8C9k+t24UJuqraopSYtkS+lJR6gkNTMzHRlQwUuJWnvGbmUe38GlHwsPngkT04AigHiA7ytCSV3Gzo+XdMS8NSx9DjptHOKG5SIG3KCIPbKSlBSeestrJAjjg8r9szKDDeF2su2iPyAljnktS6r4yT1CsZovUdWZci2W1s7CkfYECWoZC9LJ8OE00hLC5LbItL07mLFNiImDXCAoSciBn14IyLGkaEoWRaF+EdMEi70LgggAfM9K6FJx425z4C1RjdrzZ8snMLdU3Ex9Zt6enLGZHrnbSpae3Xf+vX1PzXEWOT0+7K7KZPzDvvzIuw8eLN50F12eZnwez6Zl8iVsTYAgoDmETn4nbECpFaCYeMV98Pod3gAap3ra4OvSrfYyi5PWuArsKMtGPGnUPCLwO+dtmsUkCkXwBQw4RKjJnlu7TD6EOSOv4MV/qCccQpfDu4daE7Eve5+oTLLCoYv6khktCdxq1pmMzBIIXHjomC5LCYYdnKV+LEGiHuvnaJ2vN+0Av6U+Bw1hPvMM8octLbPeNlSRQ4yNvD5okj7hsfKIJ56+RYUYfShRns90Vlgf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D7XgU7uqTFpO/QT1yedBHXGP7FV9EBE2/EjoAufmAUrHEFEYhn75NQMbonRyOCzd51B1GYgPrPUDJmrBRNwGHeIZSJ4u28+8Uv+xktSatvJDWXHX4iRmzFoioApj189bUHL8nOYZcSYo5biSHP6DdEqB1HjJRsz9F//edDx+OlGIyGWU3+ULkjxtAxdNQDVh1pw1iPGDf0JbdASjClEPAif8etxuUfUELLmyUVJSu0xgQt6344TshXFMsj6H99XFoc7nctRECUyTEBtGkgAKJAjbLq4t+haiRF6tlakjodsKw2Fly2Sq4EQvLnFovqY/XNEOpRuOU92epi/RzkJX+j6xzLitxUswYV3qH8vVRelAV6yrwbG6aMgI/sRflnPAwvT2VAqVIZRPuffDolL5wO8PBFmEAgUXnPAjLa7rUuuF5JlguUqDulK0O8SlV5GTTJqBbrz4mu6YDyoFIOnPtCoBL/US7ovgH1We/HAhBk6x6uFbcIZqOELSZdAh0HNdXaYHMeirj2pt2g0X2PO3Dct7qtx95a7Nv0trVCGCYz66ceq23jfTjYzsBtJXQ2fhbnc+JjvvjbGeQ3RjrZTqIdJg9DU5eTGFcln9FD6D6IQXotJNMENEcTizxLI9pYJMqtloIys1rY1OWNK5EaUUJ0b7fVsRe0bSW5CFwenxCWfdvyX7uBCjYfEbGXf9qD/8QmNPZjAdUXKBfC2yL6lwpBIrr6MZKF/2sjkC7jsZVlJedZeN0lxLsKPXfJ5USq+GVVg6O29OLYU5SHgtnzFX+7hMupsftWpUFT40t1CyIme515jcJOGo5hiWWZRjgxBR3ajHaV47lfSrNjyO015qlxK6nAacmC5UhhZJTatflsWBsxdGYlledQesfXGZ9LqnPEITFeEjuAEGZjSz+YW6JHT8SY3JVCn5ZrHN017ZGQcuBVsvkzCD9J8Z/hBDZU1MlQJwiIREFcgKBGxVftLjzg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c95d8fc-0ffa-4ee1-5709-08d9d1cbfffa X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 10:53:55.5923 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0302MB3239 Subject: [FFmpeg-devel] [PATCH 18/18] avformat/matroskaenc: Disable MKV-only code if MKV muxer is disabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V29HocaGXR2h The Matroska muxer has quite a lot of dependencies and lots of them are unnecessary for WebM. By disabling the Matroska-only code at compile time one can get rid of them. Signed-off-by: Andreas Rheinhardt --- configure | 1 - libavformat/Makefile | 4 +- libavformat/matroskaenc.c | 97 ++++++++++++++++++++++++--------------- 3 files changed, 60 insertions(+), 42 deletions(-) diff --git a/configure b/configure index 11342d5cec..a9e9d31bc8 100755 --- a/configure +++ b/configure @@ -3478,7 +3478,6 @@ w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_chunk_muxer_select="webm_muxer" -webm_muxer_select="mpeg4audio riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" wtv_muxer_select="mpegts_muxer riffenc" diff --git a/libavformat/Makefile b/libavformat/Makefile index 300a32bae1..c5b09b6a51 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -585,9 +585,7 @@ OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o OBJS-$(CONFIG_WAV_MUXER) += wavenc.o OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ - av1.o avc.o hevc.o isom_tags.o \ - flacenc_header.o avlanguage.o \ - wv.o vorbiscomment.o + av1.o avlanguage.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 303aa1ce50..152312102a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -21,6 +21,8 @@ #include +#include "config.h" + #include "av1.h" #include "avc.h" #include "hevc.h" @@ -59,6 +61,11 @@ * Info, Tracks, Chapters, Attachments, Tags (potentially twice) and Cues */ #define MAX_SEEKHEAD_ENTRIES 7 +#define MODE_MATROSKAv2 0x01 +#define MODE_WEBM 0x02 + +#define IS_WEBM(mkv) (CONFIG_WEBM_MUXER && CONFIG_MATROSKA_MUXER ? \ + ((mkv)->mode == MODE_WEBM) : CONFIG_WEBM_MUXER) #define IS_SEEKABLE(pb, mkv) (((pb)->seekable & AVIO_SEEKABLE_NORMAL) && \ !(mkv)->is_live) @@ -118,9 +125,6 @@ typedef struct mkv_track { int64_t ts_offset; } mkv_track; -#define MODE_MATROSKAv2 0x01 -#define MODE_WEBM 0x02 - typedef struct MatroskaMuxContext { const AVClass *class; int mode; @@ -640,6 +644,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, return 0; } +#if CONFIG_MATROSKA_MUXER static int put_wv_codecpriv(AVIOContext *pb, const AVCodecParameters *par) { if (par->extradata && par->extradata_size == 2) @@ -717,6 +722,7 @@ static int get_aac_sample_rates(AVFormatContext *s, MatroskaMuxContext *mkv, } return 0; } +#endif static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, const AVCodecParameters *par, @@ -726,6 +732,14 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, case AV_CODEC_ID_VORBIS: case AV_CODEC_ID_THEORA: return put_xiph_codecpriv(s, dyn_cp, par); + case AV_CODEC_ID_AV1: + if (par->extradata_size) + return ff_isom_write_av1c(dyn_cp, par->extradata, + par->extradata_size); + else + put_ebml_void(pb, 4 + 3); + break; +#if CONFIG_MATROSKA_MUXER case AV_CODEC_ID_FLAC: return put_flac_codecpriv(s, dyn_cp, par); case AV_CODEC_ID_WAVPACK: @@ -736,13 +750,6 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, case AV_CODEC_ID_HEVC: return ff_isom_write_hvcc(dyn_cp, par->extradata, par->extradata_size, 0); - case AV_CODEC_ID_AV1: - if (par->extradata_size) - return ff_isom_write_av1c(dyn_cp, par->extradata, - par->extradata_size); - else - put_ebml_void(pb, 4 + 3); - break; case AV_CODEC_ID_ALAC: if (par->extradata_size < 36) { av_log(s, AV_LOG_ERROR, @@ -759,8 +766,9 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, else put_ebml_void(pb, MAX_PCE_SIZE + 2 + 4); break; +#endif default: - if (par->codec_id == AV_CODEC_ID_PRORES && + if (CONFIG_MATROSKA_MUXER && par->codec_id == AV_CODEC_ID_PRORES && ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == AV_CODEC_ID_PRORES) { avio_wl32(dyn_cp, par->codec_tag); } else if (par->extradata_size && par->codec_id != AV_CODEC_ID_TTA) @@ -774,8 +782,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int native_id, int qt_id) { + MatroskaMuxContext av_unused *const mkv = s->priv_data; AVIOContext *dyn_cp; - MatroskaMuxContext *mkv = s->priv_data; uint8_t *codecpriv; int ret, codecpriv_size; @@ -785,6 +793,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, if (native_id) { ret = mkv_write_native_codecprivate(s, pb, par, dyn_cp); +#if CONFIG_MATROSKA_MUXER } else if (par->codec_type == AVMEDIA_TYPE_VIDEO) { if (qt_id) { if (!par->codec_tag) @@ -826,6 +835,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, par->codec_tag = tag; ff_put_wav_header(s, dyn_cp, par, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX); +#endif } if (ret >= 0) { @@ -991,7 +1001,7 @@ static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, end_ebml_master(pb, projection); } -static void mkv_write_field_order(AVIOContext *pb, int mode, +static void mkv_write_field_order(AVIOContext *pb, int is_webm, enum AVFieldOrder field_order) { switch (field_order) { @@ -1007,7 +1017,7 @@ static void mkv_write_field_order(AVIOContext *pb, int mode, case AV_FIELD_BT: put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED); - if (mode != MODE_WEBM) { + if (!is_webm) { switch (field_order) { case AV_FIELD_TT: put_ebml_uint(pb, MATROSKA_ID_VIDEOFIELDORDER, @@ -1031,7 +1041,8 @@ static void mkv_write_field_order(AVIOContext *pb, int mode, } static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, - AVStream *st, int mode, int *h_width, int *h_height) + AVStream *st, int is_webm, + int *h_width, int *h_height) { const AVDictionaryEntry *tag; MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB; @@ -1106,7 +1117,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, return 0; // if webm, do not write unsupported modes - if ((mode == MODE_WEBM && + if ((is_webm && format > MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM && format != MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT) || format >= MATROSKA_VIDEO_STEREOMODE_TYPE_NB) { @@ -1192,7 +1203,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (st->disposition & AV_DISPOSITION_FORCED) put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGFORCED, 1); - if (mkv->mode == MODE_WEBM) { + if (IS_WEBM(mkv)) { const char *codec_id; if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) { for (j = 0; ff_webm_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { @@ -1271,7 +1282,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, && av_cmp_q(av_inv_q(st->r_frame_rate), st->time_base) > 0) put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->r_frame_rate.den / st->r_frame_rate.num); - if (!native_id && + if (CONFIG_MATROSKA_MUXER && !native_id && ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id) && ((!ff_codec_get_tag(ff_codec_bmp_tags, par->codec_id) && par->codec_id != AV_CODEC_ID_RAWVIDEO) || par->codec_id == AV_CODEC_ID_SVQ1 || @@ -1293,11 +1304,11 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , par->width); put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, par->height); - mkv_write_field_order(pb, mkv->mode, par->field_order); + mkv_write_field_order(pb, IS_WEBM(mkv), par->field_order); // check both side data and metadata for stereo information, // write the result to the bitstream if any is found - ret = mkv_write_stereo_mode(s, pb, st, mkv->mode, + ret = mkv_write_stereo_mode(s, pb, st, IS_WEBM(mkv), &display_width_div, &display_height_div); if (ret < 0) @@ -1318,7 +1329,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } if (d_width != par->width || display_width_div != 1 || display_height_div != 1) { - if (mkv->mode == MODE_WEBM || display_width_div != 1 || display_height_div != 1) { + if (IS_WEBM(mkv) || display_width_div != 1 || display_height_div != 1) { put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width / display_width_div); put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); } else { @@ -1335,7 +1346,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } else if (display_width_div != 1 || display_height_div != 1) { put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , par->width / display_width_div); put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, par->height / display_height_div); - } else if (mkv->mode != MODE_WEBM) + } else if (!IS_WEBM(mkv)) put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYUNIT, MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN); if (par->codec_id == AV_CODEC_ID_RAWVIDEO) { @@ -1347,9 +1358,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, end_ebml_master(pb, subinfo); - if (mkv->mode != MODE_WEBM) { + if (!IS_WEBM(mkv)) mkv_write_dovi(s, pb, st); - } break; @@ -1370,12 +1380,14 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (par->codec_id == AV_CODEC_ID_OPUS) put_ebml_uint(pb, MATROSKA_ID_SEEKPREROLL, OPUS_SEEK_PREROLL); +#if CONFIG_MATROSKA_MUXER else if (par->codec_id == AV_CODEC_ID_AAC) { ret = get_aac_sample_rates(s, mkv, par->extradata, par->extradata_size, &sample_rate, &output_sample_rate); if (ret < 0) return ret; } +#endif put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); @@ -1410,10 +1422,10 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", par->codec_id); return AVERROR(ENOSYS); } - if (mkv->mode != MODE_WEBM && st->disposition & AV_DISPOSITION_DESCRIPTIONS) + if (!IS_WEBM(mkv) && st->disposition & AV_DISPOSITION_DESCRIPTIONS) put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGTEXTDESCRIPTIONS, 1); - if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) + if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) native_id = MATROSKA_TRACK_TYPE_SUBTITLE; put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, native_id); @@ -1423,7 +1435,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return AVERROR(EINVAL); } - if (mkv->mode != MODE_WEBM || par->codec_id != AV_CODEC_ID_WEBVTT) { + if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { track->codecpriv_offset = avio_tell(pb); ret = mkv_write_codecprivate(s, pb, par, native_id, qt_id); if (ret < 0) @@ -1642,7 +1654,7 @@ static int mkv_write_tags(AVFormatContext *s) } } - if (mkv->nb_attachments && mkv->mode != MODE_WEBM) { + if (mkv->nb_attachments && !IS_WEBM(mkv)) { for (i = 0; i < s->nb_streams; i++) { const mkv_track *track = &mkv->tracks[i]; const AVStream *st = s->streams[i]; @@ -1695,7 +1707,7 @@ static int mkv_write_chapters(AVFormatContext *s) return ret; editionentry = start_ebml_master(dyn_cp, MATROSKA_ID_EDITIONENTRY, 0); - if (mkv->mode != MODE_WEBM) { + if (!IS_WEBM(mkv)) { put_ebml_uint(dyn_cp, MATROSKA_ID_EDITIONFLAGDEFAULT, 1); /* If mkv_write_tags() has already been called, then any tags * corresponding to chapters will be put into a new Tags element. */ @@ -1855,7 +1867,7 @@ static int mkv_write_header(AVFormatContext *s) int ret, i, version = 2; int64_t creation_time; - if (mkv->mode != MODE_WEBM || + if (!IS_WEBM(mkv) || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || av_dict_get(s->metadata, "alpha_mode", NULL, 0)) version = 4; @@ -1900,7 +1912,7 @@ static int mkv_write_header(AVFormatContext *s) else put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); - if (mkv->mode != MODE_WEBM) + if (!IS_WEBM(mkv)) put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, mkv->segment_uid, 16); } else { const char *ident = "Lavf"; @@ -1948,7 +1960,7 @@ static int mkv_write_header(AVFormatContext *s) if (ret < 0) return ret; - if (mkv->mode != MODE_WEBM) { + if (!IS_WEBM(mkv)) { ret = mkv_write_attachments(s); if (ret < 0) return ret; @@ -2010,6 +2022,7 @@ static int mkv_blockgroup_size(int pkt_size, int track_num_size) return size; } +#if CONFIG_MATROSKA_MUXER static int mkv_strip_wavpack(const uint8_t *src, uint8_t **pdst, int *size) { uint8_t *dst; @@ -2062,6 +2075,7 @@ fail: av_freep(&dst); return ret; } +#endif static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, uint32_t blockid, const AVPacket *pkt, int keyframe) @@ -2089,6 +2103,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, pkt->size, pkt->pts, pkt->dts, pkt->duration, avio_tell(pb), mkv->cluster_pos, track_number, keyframe != 0); +#if CONFIG_MATROSKA_MUXER if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 && (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size); @@ -2096,11 +2111,13 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { /* extradata is Annex B, assume the bitstream is too and convert it */ err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); - } else if (par->codec_id == AV_CODEC_ID_AV1) { - err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset); } else if (par->codec_id == AV_CODEC_ID_WAVPACK) { err = mkv_strip_wavpack(pkt->data, &data, &size); } else +#endif + if (par->codec_id == AV_CODEC_ID_AV1) { + err = ff_av1_filter_obus_buf(pkt->data, &data, &size, &offset); + } else data = pkt->data; if (err < 0) { @@ -2109,7 +2126,8 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, return err; } - if (par->codec_id == AV_CODEC_ID_PRORES && size >= 8) { + if (CONFIG_MATROSKA_MUXER && + par->codec_id == AV_CODEC_ID_PRORES && size >= 8) { /* Matroska specification requires to remove the first QuickTime atom */ size -= 8; @@ -2261,6 +2279,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) &side_data_size); switch (par->codec_id) { +#if CONFIG_MATROSKA_MUXER case AV_CODEC_ID_AAC: if (side_data_size && mkv->track.bc) { int filler, output_sample_rate = 0; @@ -2302,6 +2321,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) par->extradata = old_extradata; } break; +#endif // FIXME: Remove the following once libaom starts propagating extradata during init() // See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012 case AV_CODEC_ID_AV1: @@ -2721,7 +2741,8 @@ static int mkv_init(struct AVFormatContext *s) si->avoid_negative_ts_use_pts = 1; } - if (!strcmp(s->oformat->name, "webm")) { + if (!CONFIG_MATROSKA_MUXER || + (CONFIG_WEBM_MUXER && !strcmp(s->oformat->name, "webm"))) { mkv->mode = MODE_WEBM; mkv->write_crc = 0; } else @@ -2755,7 +2776,7 @@ static int mkv_init(struct AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, 1000); if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) { - if (mkv->mode == MODE_WEBM) { + if (IS_WEBM(mkv)) { av_log(s, AV_LOG_WARNING, "Stream %d will be ignored " "as WebM doesn't support attachments.\n", i); } else if (!get_mimetype(st)) { @@ -2783,7 +2804,7 @@ static int mkv_check_bitstream(AVFormatContext *s, AVStream *st, { int ret = 1; - if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { + if (CONFIG_MATROSKA_MUXER && st->codecpar->codec_id == AV_CODEC_ID_AAC) { if (pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) {