From patchwork Mon Sep 6 20:20:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4059374iov; Mon, 6 Sep 2021 13:20:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYYxV4nlI3a2n0UY8Ozdp7SdhTqAwrmadCX9AvzzzJwmYblzmmFLDvK6U3e5A5nCrpHL/t X-Received: by 2002:a17:907:1c8d:: with SMTP id nb13mr15676553ejc.155.1630959646140; Mon, 06 Sep 2021 13:20:46 -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 k9si10613278edv.565.2021.09.06.13.20.45; Mon, 06 Sep 2021 13:20:46 -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=siJ4rllg; 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 0F55368A6E1; Mon, 6 Sep 2021 23:20:43 +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-oln040092065050.outbound.protection.outlook.com [40.92.65.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8968F6897E7 for ; Mon, 6 Sep 2021 23:20:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bPhA/dUDvc6GjHQwH+wk6S/w9f6qwXDebKW1VzvCi77ZomxARKidgitwQY8htHUlcHVX7yMdWamkeobKNjZinZn5K52ZpTx2Ssh3qBWfFl9rxwco9QCDYfcgn6/KagNrokZMbp/k84TTUI3RnpAN9xXOZ8BrultifqL209DxHdDh8wFhts90esiLfumXeernyK6/sKYJGqK3iz20gau1cRlPWQ1xosyshhYREbMSmOl4qx/MTIWjKieJYvZlFn4Kq2JAn3TmPJKJrKxRnABnngOoSiqHARBKpai8aT1xBAkU8miEYIbAgoxQDxu0+O67C1w6Azinua69FjlkATs7fQ== 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; bh=SIg0xOIsn01+0y2U3Fe4T0/7qWbNlvBiEvgFYqHqo6Q=; b=Kl9yqvsJ8IzozAEvhWqcdapz7geyr+H5BvnrYV7/8Vaq2PP1tMaB9gzid8oeCFmiIeTqS+HJVsriE3p1tMH6ciy0ZAOJ5NDT+QyI+nmDOIs15LSivc3kUm2pzOWXHPQBVdPwXq+kz7NWxtktTpER94mmTQpKIgF1IQc1QSkhIXoWL2167OnyJOir8XhWkb6/pjST6CO8wVY+NEscplQLkaq8Jw7bc/gxheG0VHnM9u6yG2Ij8COX5Eaz0l2ZPiIaOWy3BtneT6OCPRimHB/HaRGCDmmvXBcIE3wxiMJNb4jfwu2qwMvREFtLB9BSRpiR8wo+EhCqLAs2YLkDySrl7g== 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=SIg0xOIsn01+0y2U3Fe4T0/7qWbNlvBiEvgFYqHqo6Q=; b=siJ4rllgFUjQq3C4NfDTMgcD6v9eWLvpJXIdTdT5wjtF9wB72uzhqqkwVhdbB1KCrQyy46A9g0u+T8Zy9iq/DkoREb7cBTAXQcXGc/TM/NS0UldFnAxBaV9tafpAl7gKoNfu3WM0Jic5QInsZorFRv6YVxZ94ZMv+c/e09nnlvuVsjenrGVZrWmy7NlBBPPf2DqcJH9QRku99liDZ1pqWp7QmikSWtUX1AfRyxegHZdEVittbXo1tIGfyRfJzIKODFF5mk2nWaWWV4Stv0CKYIpyv0+5dUFXwHfQH0BaRMq/urevFnRdK+OJ+lyBmIuCG9jOZHKssZGiN3W+lbR7kg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3010.eurprd03.prod.outlook.com (2603:10a6:206:1b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 20:20:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 20:20:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 22:20:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [WouC1XU2seVqzzdW4HJxET32v7Vr03uw] X-ClientProxiedBy: AM4PR0302CA0019.eurprd03.prod.outlook.com (2603:10a6:205:2::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906202028.306700-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0302CA0019.eurprd03.prod.outlook.com (2603:10a6:205:2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 20:20:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f6c9fc6-2e72-4c53-12df-08d97173c86d X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wok5Hcuorz3BfdFq0HeJQLttK0EpQMHFEbKZdvwoGb2f42gwHPAfNLRbi7Dw622pxDCnG+OmhoNaW7uyjFB23nc43BrlctByOWd2c79zuRLWRbRmTLRIid/xjYJDg6owJ1RiJmW0Yfnyhv83kC1YGI1+lwoOAQ2O1sQeQ2Eh4+JYXWOompniJeKDrLqTWVOOcqhKmTKdVkGE9ZuuuQgU6MqFeK/cba3wUt8v2X7HSTIgbdNj0B6w4sd4nG0pupaBJMDKm9ca1S/DeKf2q1Ourj15xAZnj4Tm/nFBc9vSi4fYPygHgrRaW65BLxw89BORgSIfSJIlmXj3YPzgFC9M1oZEA3g30a2eSCLlc/BLDTB3rO5x4i0ujT1uro46tBg+LQs2EMbira3X+bhG8rmnJb42KF+iDAtFrph7RhdfB8KP66dE98rMMFsJbfT5/l9Ks/0vTkl/Qw+c9K9AqROYR9aYzL4XeZ3Mge1PLAYqyN+ci443hD7EZvwMrLAoS6+NWfxqfmIubFIpMgYouDoDqQyjwkYncRykyYQyVOrlK0nueqdblFvtEuUhaZXPPDS8SWfVVjxuSIWXoIQF7+ashkBNf0G/zF8gUcep690XUY56Db3cAtHMzR0lH+zLoD76u7aDx80CBtPC2AH3TMIElFq4S8gG9iRJaNHdMCbMkmU2qjt8EZN9WjtWC/73TsTuC+9GTdesmxscQw6Mb61Hm7qqdJKf7LTdyYoAZE6HvpLFLxALfnij/YBA1E1iWTSp0Nc= X-MS-TrafficTypeDiagnostic: AM5PR03MB3010: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9jqMqwyIgwEgB2R/NF92ZxVRG87do36nqmkBTaZyTgljlA8PZr2hOYYPvTdVlbqMpAVMXBvdMUmYsJLs9bcveFatmpiZtzWT687giQ7sVuIotfNYjb+rC1E9xO/uMtzkOLpy+pNZ6XBeYIEumq92NPigzmM+9rv9vFqbXHRY87D/E+oIzKFfy1efPUBkT2bnjc254VyEDIwEqP9iNkAVjaO4aE09WPdk/MkFy+k6BufaAxQuGDuWELPx3cQRTD+6NeT+IimBDJl4cUEc1e8KlfWBo9vzSFjPTCFuZM15stqqmE7acvJJd0C5JFWdyy79sh0ugL9kwbIQ1Zwz3hj1TfTJlITOuzgYLIM5sORzV8J4qzhq1G+9z/5QSPKOl2t6qfPZbDSDJ6mQ19BzdS7QWC4k8ZUjm7YeMxBXT47M41WbB7Xe3SGRSK+C7uW0aY1V X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZdxUQrmjwa+z1sWlU9U0xyEIpRuZKVis+h30N+DbFhTvpMG+vtj+RpzMbRFOaBFnNf9f0E5ZevC/AFedAYlXo8rl58grNgbOCcfQY7ifJ3Z8hPQrCQpJwrbWoX18snIu0Nk/O45TQ65rthYa6u2PWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f6c9fc6-2e72-4c53-12df-08d97173c86d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 20:20:35.0053 (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: AM5PR03MB3010 Subject: [FFmpeg-devel] [PATCH 1/5] configure: Remove null_bsf 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: IOJnt7a4H6Yu Unneeded since c96904f525afcaba756a5ce8511a3ee1aa9fd2d7 (a bsf-list with zero bsfs is used since that commit). Signed-off-by: Andreas Rheinhardt --- I used the (always available) av_bsf_get_null_filter() as the fallback in target_bsf_fuzzer.c; although I don't think it makes sense fuzzing it. configure | 1 - tools/target_bsf_fuzzer.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure b/configure index af410a9d11..a2b834c760 100755 --- a/configure +++ b/configure @@ -3726,7 +3726,6 @@ cws2fws_extralibs="zlib_extralibs" # libraries, in any order avcodec_deps="avutil" avcodec_suggest="libm" -avcodec_select="null_bsf" avdevice_deps="avformat avcodec avutil" avdevice_suggest="libm" avfilter_deps="avutil" diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c index 56f011ad21..73bf4bdf0e 100644 --- a/tools/target_bsf_fuzzer.c +++ b/tools/target_bsf_fuzzer.c @@ -54,16 +54,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { #define BSF_SYMBOL(BSF) BSF_SYMBOL0(BSF) extern AVBitStreamFilter BSF_SYMBOL(FFMPEG_BSF); f = &BSF_SYMBOL(FFMPEG_BSF); -#else - extern AVBitStreamFilter ff_null_bsf; - f = &ff_null_bsf; #endif av_log_set_level(AV_LOG_PANIC); } - res = av_bsf_alloc(f, &bsf); + res = f ? av_bsf_alloc(f, &bsf) : av_bsf_get_null_filter(&bsf); if (res < 0) error("Failed memory allocation"); + f = bsf->filter; if (size > 1024) { GetByteContext gbc;