From patchwork Fri Oct 8 08:14:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp625133ioa; Fri, 8 Oct 2021 01:15:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtbQAunK5srUxX4lTY50ddMHfGjmTdkBlmi+m7a4hwaqlqOcSM3NVJHOaCd23kHeZQ44FS X-Received: by 2002:a17:907:f83:: with SMTP id kb3mr2502978ejc.453.1633680902829; Fri, 08 Oct 2021 01:15:02 -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 l10si2002960edq.241.2021.10.08.01.15.01; Fri, 08 Oct 2021 01:15:02 -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=E3b9sqEG; 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 2CFDE68804D; Fri, 8 Oct 2021 11:14:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CF4B68091D for ; Fri, 8 Oct 2021 11:14:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kvnpjcCIZZLvEOEwandA91DKkCr5MsqLG3KDA94u7JSdLHTra6eFQeOU7Fl4F8M2eUBnVbku2cPNEaL4NF1vFZOhz+Mad8YqgaNPN84NI6eGgagAzl21yVIS4uEdb8oiyFraPMM5XRjgbGP2M58YGtE6fwpXPDLtfVFwI5xffN/eLB0HOyQ4ndh/Scc5By42wFEID16xsaja7+aO+zl5OjHPtMKKeq3uSB66VOY0jBNnXJClIva3Aiai5a+EGEb9UUmGkTecqL7zW3UnDui+54M7gDfLScOnca5W0keewYIp28BcLey5dc70Znw+WyNRG7FTlhkXNg9lP8CTsN1P3g== 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=dF/yUOsZU5NhK8RY8rESP4sFMXjtUjbpaM7nVvw6NqQ=; b=nIcZBYbWGduVaWfir3WOyVxywTTz+BmNnxGiWkyfPE41trdLqmH2g2ZWNn8sytLzSKOuAeTk4L2OlM8wcQXhjssSsnjLFtgUrV6bmzswolg//gysSqnio3rdf8pkCrOANmYONpciHlIR6Ts3fV2B0uzxUdxFOrVslqiaoDawgIdqO1ro9GCULbOXNcU5A5398DWfPZunSVCUNTyQuWYoy62TchnsbQMz/X39/twekf7PxWsu39U4kgkilNehqh11oG2CiO4bQwdLkumH9Rh4OAEP+js/raqGRi1N2Nwj+eXe58hvkO/ejeWSsQmTBlzUrzSHbfyZl+cu+k1xAYvcZw== 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=dF/yUOsZU5NhK8RY8rESP4sFMXjtUjbpaM7nVvw6NqQ=; b=E3b9sqEGXxHEoHg2gl1JSBSz6KmQcZCnjmNSqBGbDrUq7On722SSIQp9uD+iyrSGdxqHAyLiQjHinLLay30BoPACw9KprlA+wuJTrB+jb7VUg8b5k1+ZzoL6PD6GX50fkClJYIh/AFdqar/sF0e2QVemwNX0JOhX1gVji2XIMG18NvElQvQ4/IrB0tTes9utBXHSI2UHcJ2AIFHCoU0pBjSgimNA1YFNeSrOZdLThto8gZATbLEuPSBMy78i3lY3+LwAxN5X9T9nerGN0nFGjX3dB8vnKW9jJ1DQWe3sfsnWuNqP/mQTgxQHJ4rnq24STOMQLWXCQc2lkAdvBPjP9Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4951.eurprd03.prod.outlook.com (2603:10a6:20b:82::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Fri, 8 Oct 2021 08:14:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 08:14:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:14:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P2MQnWqXYtm4TOHqZaLhR5ruo8CNzkE0] X-ClientProxiedBy: AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008081440.1156233-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.4 via Frontend Transport; Fri, 8 Oct 2021 08:14:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91c70489-a794-4791-48e9-08d98a33b27f X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UXq70ozwkY25vQtL830JLO/unR4DrCADVJQEEyUzD6bjmhDqPfUwATF6xcNM442MzAv4ljgbuFkvsdyZWCXeioq9+mVoJEgMg6LbVMlMpVW/7FYIywK/+Wr4jjrNoWkZkMkQMK5sdXsH6hDrg/xuEcJdA8uAwFpFlBUtuyN7J8Qk/msh48c+WTrCNs0ZHo6nycuKb181n7soryJaokPFN0dYz8tMG+2fiWIXDV6ZS7WmsHpo6ztb/tpbEiLwH6KeallGP883/j4ElxECDzDYQkkbK+hh9gvol67fyuVRAx3wGDpATo3uOWlv3jBSodmPBl+ICtizegL+5yCddgwXDP8OWiJxFhOA+gCgaT5BOVzY3KBz/qSDCTMYEQXUlrgLipmnlQovd7ncY9lwZJWxe3mVx0XRzmGB0Kq1qtPoPCITtER01QdxH9UKopuj3+WR1DrgAnYUzCox1bGjOCmv4LqRyMzZEo2xM+4Fhp6Jr1olo+x8nqWlN1CMGZgR3TqZAUizeVIcb08eNtGv76H1zKFcM837Jfj/sKukujPZvwrWxIA2+7eMVYZju8bAbi6VHn9/jJ9y4KJC4pQPmO/5G6p45OCdu0YXhNFqmOVwA6vWqnlhkiwC+BjLJ0O6HE4A8+Bat1Ip8BV2kZ31HAmuAjah52RwsLy1feuVsQYYULeLb6asoe+npOGdS+O/10HY8hY6wryOPHm/XWtWi4kCk6Ku1ooKZGEcI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4951: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ec6Bq9l+pjuWZ1FrKt3n7D+Mvdf8UCQQeGtZGdffKGhc1w0Y1ZDlg7v3zxlHnFa+8KtjvU4vBmSwme90KEvqsIyi240vDLOfvAFd1m3gT7DxpxsTmf3Ch35MG2QQ6ygx3vuaRbbMCaC/pNJO5XeZ2OnHGWeyuCTc86mgViadyPNcq+SNaLvjJJNxkAFX7BXz6Uk2arsdgsWJT9wJjFx6dcafspKGg/HA8zErUzFiKrGhIaStyMcAmDJqKRQTji7xIHvXtHsAj2mrpkOm3F0ZnREVtO0IRA+aOOw5b48wy51EQzzJnPDa5HJ76Fg3f0yNkcbtEhXhoSNFBsl7N5SbkYMsIEwz8MLVdVAoJNLSyTWOR+REpgFRhli8m9OSCQBqPhIzYcutip2U4gyl7rgOJpa094jfdjIlbcIgi3sZmBNZUIpNIKRRk1oON46o6LsL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vt/9gTTbZteZLtpQ+pUSlzvi9TGVHXSvBUUpUhY8wS7TZdvMo7mQglhpNk3RZUKkP+m8t/zfIh3qH0Z33BeEQQr2cq/0VA0KoAlMXEZggM1OYxleHdC4BkfAf91/GoTyGTbMbW1zhJRZHKUkYr8T9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91c70489-a794-4791-48e9-08d98a33b27f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 08:14:49.7763 (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: AM6PR03MB4951 Subject: [FFmpeg-devel] [PATCH 2/4] tests/fate-run: Use DEC_OPTS for additional input, too 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: yaYZmBfn5JKD Should fix failures in the cover-art-flac-remux test. Signed-off-by: Andreas Rheinhardt --- Sorry for this; will apply this soon. tests/fate-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 87b5539296..fbfc0a925d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -232,12 +232,13 @@ transcode(){ enc_opt=$4 final_decode=$5 ffprobe_opts=$7 - additional_inputs=$8 + additional_input=$8 + test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input" encfile="${outdir}/${test}.${enc_fmt}" test "$6" = -keep || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) - ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_inputs \ + ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \ $ENC_OPTS $enc_opt $FLAGS -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile)