From patchwork Sat Mar 30 22:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2722006pzb; Sat, 30 Mar 2024 15:55:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUtqImEizRDoLfo8sEHjw5wwkK2t3a4SjW3QM2aseN3VbUUCUXnTWvDY+CCPLnBTRs/lJIBljOHVfC27LIVgKJwMVAZOtBlKLJ20g== X-Google-Smtp-Source: AGHT+IEQ2tEtUaGbtk6lQgXqUfaB3Yjz1s1dLISXDaFOvsaZLdI98v0dF4XBtiSizaHvWQau3O35 X-Received: by 2002:a05:6402:2707:b0:56d:b659:508e with SMTP id y7-20020a056402270700b0056db659508emr3894883edd.0.1711839307666; Sat, 30 Mar 2024 15:55:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 27-20020a50875b000000b0056ba7363b3dsi3081434edv.28.2024.03.30.15.55.07; Sat, 30 Mar 2024 15:55:07 -0700 (PDT) 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=bmRK71sv; 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 B510768C8C3; Sun, 31 Mar 2024 00:55:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC7AF68C455 for ; Sun, 31 Mar 2024 00:54:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RSDoNoVAOK2tVg4BXpovO87t5bgA7h4qgiN2WMbzPhSpINC/NqXpHmyHHLF+WrCfVuB5bcjxXAiVDJOc1VkV3lO4Kj9wDeZsCSBb8ogjBnS8MbWKOFY0OUmVsjBrGzYF/eCRzYhKInpUyS4b7wdOpfpcOZFFudpWcEo80nRvH7ChtHSrGL9w5a0vVmA2W4XqOu4q6oncMM7p7AAO4yDX5NQA09lqdbQ6tt/cdezl0ZJPts+j3d7YneggbzAUyYQQ3QriYRMCUnxZ8qqRYC2VkG0rv1z176oRsytP78jUxru9f4ruVpRsoxronBkoQVnMosl3AJCG//aKTACcyBB7xQ== 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=wsfiBj9VcMVplSa0Q8M9zT29TToBAlLGu+5ytOGHTbY=; b=V9FTXvgg95j7O/yCY8ApBMyIE1JSIw4Xdi0oVhEiVD7+DmKoj0j0PH4biCMrtgPALSI44NnKJ0zDWNhedPzlyvt67P9ybKChtCpCYveR5FxloyIQ1b4Ilot1qpdFnNMXR9xil9tvRhUkedq0wQ9FM8urPoL/qBDLBiRG3TC5XiV1ufEFYtecGD7N5HIIZLuyjPajOm9W3yeAwxmaE8RwWGNr4OQfJxuBg8RKpz7BUxCJhiaCpoiKBtJqPaJtJ2IZlUTyZ1RpPcPDG0Ilc9yeazW+kv8DIczzzYyvJb9F5b+Bczr2ximkeYm87jlLbz2QKA9wsU//652jL3PYHYvDQA== 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=wsfiBj9VcMVplSa0Q8M9zT29TToBAlLGu+5ytOGHTbY=; b=bmRK71svbn9ocr6FpOM1F45WvqBIKp1FozYRbmcD2Xuyp9qwWJxaK34nHuD1EbKdoA0ITgwvLWAsJ8IdJS/pMHE4LbqIIr6roqcz3EoqG7xFeae1i5coaYE7PVvCnBPorxLV08chMinc0ONSbUWDh9o0ZjeAQZ8w9/5cm5GF3Vns/EEv5vcoVYxRZuNxkfU0Fa4PoaFBiQVdLWuCXL84/NbgAsM7NK8uxvF8T25jNZoszeUVmSvQnKRp/DNG1IC0M97A6wpS9jj8kh3KFA9f0QWuXo04uOIqe+i2pbhvL2t94nQRHDBm/FnluiLVqpqpePhEPuCM1ctORUboCwsgfg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:54:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:54:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [VC71to/9ms76WJ1aeA22KZXmVYY9WWO0k0wISeMQAQk=] X-ClientProxiedBy: FR0P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225448.3406381-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a1a1dc6-34cf-4d28-6218-08dc510c6b08 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jRXOiSLl1vImPrHnPtKF4ivff8kNTBJpgvnEI8j/T8l5kT9k/gKuGtmgvZeuDozgOPF198ZkL7FJ/YEq8mHSfmTDsryuUQJuByxiA1/dve9Cksf4NdFgHwxfUmg9QvUDRRGYzhbugt5ODE5ZzD5aQ1aTBv60buSzGefX317pygLOCK2w+FxqU5RKoBicJY1Js7XFj0Z1wAhsQQhHKVFDIyyRRA/dv31NotbMjS6fEXMfSWUxGrLdddR2ZAMRC+ajAdKgzSmi3hU83hw02G2WPpN3P02/PNbcHwKUlZ0Nb4Kx8RysNH6JbfNFq80Fk1QQpG1OlnMu30sBWgy7VWMsmILhd6yRXO5AhDRlEu0X7Ohd8gtdQvqmty3ew6SJjX8BK2eHKF12FH+5K6S8U5+Gy73avZoOdKwVwa2ga2Okgk/Vw2TmgK6AQIHXe1wJF4uwdzg1XNdKhO/eAK/hpVpa+E3d3w5SXhaYRPysLn/5la89Aw5VPXcc8g6YASEfnrSSWtimwCevcs8TDETHWz8L9GGd/bzbFCWs8yvxg6ZaJZNtdcnN5MX0BoZeJ9zz8YNzEeNe6EIOG2UhxOXgBdGLZYOqC5zkFquQI6CCA95g15aTUGhrM8nwkvx7Y53egDlz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k1d4tAyFmmx266REWub2s3PlHenm3Dl2rFR275qtPQ355jy7eE8jsLUu2FctewFvYF18EgzfCVURq7R26u1hwF18p1Hkp1XLefXdtB904ko3849OCe2fhTaFKbQJ+gZ79jaaaPSzEpaKjNR0I0BYgBRSBWBEfLdmeDRiw9708gmj9D0DuZ3IU0ku3G6wgM/lHDj5CYrMicOGZhWmLZZOUW4j0U5y2ZmDgIdsvw/q5Fpv1KfUK989UXIBlNZ17FXkatoxMreI8bPjTO1FgKIRF/o77tpxE+xZc52hkOrkoGFHPZf+E/06lGp7uS7oi8jahpX5EKrxb8ufeY5Jdh/+WhUTXDvL0f4np+r+JFRQzY2gW1LNV9yxTxLtiIfqeYsDZjIPeQWmlSIZFjmbqqRU8xrNniFnJTt78XsM02bqrpv++K9ajOCaXEGzz4sIiw1YLA5Fcosn9RjiFClGXLPdxP7w7R8fLrBW53dnVRLYilMagw0t1TBYnF4rpCRoq8XNEByRwwkm4yvdy0gGs6D75UuBs/XguqpArZPDr0C7nF5RzJK/bJWQpp6WHBwB5yqDWVGGD6qANZjGoyZ+5iBxSRzzspMYkk8DsFrW5Ox6vVm6oqmbKBhgnFYLKGOQWMJ6YwLKMgQTzwMCz8TpGgLOPrzH/vkOm74AdGlB8CHOMvEbHxHXh5N/9vby0ZSh6iqnOxvSMVjnhCIgmqxY5e+dgOG+Ot9rfYErPMJL+M3KKRh3ayA6s7b23aN96gxIw5M753xjC2Cpp3lqawX1/L+wiKxq9XIF9XyBBTpaRons7ccdxVYf+VR6dO0Nnc5Ux2TF4sSas+CWrlJ1cNSvL7lEx4kJs0y/TvzGkG945lLWKBnn0LrNMBLOx9cz1piClp7uh/vpt5SNvDu1ycb55ba6Jh6zd1gkDOTwXv+ABCdyD9NyeX2XLbTYX7SQomwOq6/R8pRSzXmUrCwSJbDL+Si9k6h6lkP6g9Y3PuUK6sdj0cP/g8rD9BRyz4+jJPSiY3WWwf1KmmXpzsU6jYCrVGHqGr1W5Ex4+XlJ4QjwkEZ92YBNdKfkgLPYKyr5i0i93I7uwNvpD7rLJxjCAQAGsblnUvNTAYWNlapEq5b8VsGeOuyZURL8SnyU4IS+ik+KZ4BfbodGOG8mSCHBPGbTiIg9PvC6lEYEQaPrbEY4reRbxDFmHwkKZcFrj3r7t56FU5d+N51lt5dizPufAny2+HYPwDoyswKFhqbQYXfovA1UbIxqsdJ/mdfoq50WH/0L2WIlJGhI3/9ZakVEdLcDYulw5A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a1a1dc6-34cf-4d28-6218-08dc510c6b08 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:54:55.9264 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 2/4] fate/lavf-container: Check earlier for presence of ffmpeg cli 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: amTzaNvkat7H Several other tests (e.g. concatdec) examine FATE_LAVF_CONTAINER in order to enable or disable tests that depend on samples created by the lavf-container tests; right now this procedure did not account for CONFIG_FFMPEG. Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-container.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 7a925117c3..d89174d221 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -30,7 +30,7 @@ FATE_LAVF_CONTAINER_SCALE := dv dv_pal dv_ntsc flm gxf gxf_pal gxf_ntsc \ FATE_LAVF_CONTAINER-$(!CONFIG_SCALE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_SCALE),$(FATE_LAVF_CONTAINER-yes)) FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%) -FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL), $(FATE_LAVF_CONTAINER)) +FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL FFMPEG), $(FATE_LAVF_CONTAINER)) $(FATE_LAVF_CONTAINER): CMD = lavf_container $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)