From patchwork Thu Dec 2 16:15:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp287745iog; Thu, 2 Dec 2021 08:16:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzog/xqJzHAYIvHmJeOIgzAQskKOkhEgq+nnbidWxqTsVsIldCoz8ek/4RTVsg1E8NHLj76 X-Received: by 2002:a17:907:2d20:: with SMTP id gs32mr16202359ejc.270.1638461768547; Thu, 02 Dec 2021 08:16:08 -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 q8si260388edv.606.2021.12.02.08.16.07; Thu, 02 Dec 2021 08:16:08 -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=pOVoGWsC; 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 AB9AF68AE5D; Thu, 2 Dec 2021 18:16:03 +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-oln040092075031.outbound.protection.outlook.com [40.92.75.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7062768A948 for ; Thu, 2 Dec 2021 18:15:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f072i7EptpgvSaoZi0g/bt8ySnrr8z0pd1/4ETk63b7GiG2KdSKEZH46lYkGRGG12Rb7M/CtT/fGvq0ZYxoIxkjYYPqi5s4iYriPMseJTQpbkd++7RgQW5Yy1tgel4VMLrUiPSY9f3SqC4PLPPfb4MlSUk0GfpPx67SbOFrMsPaCIl2EGj+NQHcAs8L3riuWJqtsUXABToW5nyYz6jgDSEWfWAqRlHRfmPk8yOYBj2JnEQ2QUblPp04U/Xe8qiviZOmrABvDjpKuCSz7nCUC9VCCUGvXxD0LfmiSPCr+l+ZN1Z74Q7kaM9GQ/3N3ed2ULmEO/LKsZYNavsajgN76Bg== 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=AEYioovqRmKN6asw4/1cf4ls7p7HqQ18Sx2Tg6kffvk=; b=l/l/e+kBcdAemGg1+OIqOnJub+oBbzWo7CQ1lxN7JNzSQkOCZSuyhvuFDbkFhAZkY3Ij3gmNFrZaVNMSzajyGoB5Qz02grwsi1xqTMqAUNoh93OoNogHwPLCsMWyiKb44Te1R+aUAzNNcJoBOCAD8QMz5WdBQHm+FsGvxKOplNdUW6uHeIjYTg4OnsMV2h8lVPkVHUtelJHxlm3sb4nbe3U0vMZWA6/PkGp4f6gH0WwIfqhF3x7rZZYjMqtHZhwMsj/vGGg9weCMcs8AcF2lUwE+xzOlJzcnuB0QoZgSgUpObMhJaPfZHBdjfoNzfcNydaaHVfHTSs1FWgi96Fm+Bg== 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=AEYioovqRmKN6asw4/1cf4ls7p7HqQ18Sx2Tg6kffvk=; b=pOVoGWsCcM+A9HowJ2JmeaIcrfTYgH/Hrchg40BvyeCAcY5diOG0xjNJ9W9H2vMA/7jDtwRx3QLYb9pc5TCkVSPPvqzord0NU4j7y5PagsX9zMUh8G8C2vuUM0xMJeamYkbbSgnDVkIpJp490tM9+YtguyODJdfSbAwr3g+2S4nF5ZvAYni+hHhrRiMVtj7urwm4lXqPqPyKtvEP+LB03FEzEnm6M3/cSNF2fHVQuo2Z7VXkFtNC74JyETeOPSv3Ae2jEThg7RNFb6xuuDww/BGzWmVuE/FafumzJAqdjmMPSmgjoJqODdDaQ5xQtFLaEhG7KBaSieEBFXP/5Z3m5w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3685.eurprd03.prod.outlook.com (2603:10a6:209:33::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 16:15:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 16:15:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 17:15:47 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [d3C4TR/aPS5N1e1qJY9d6rTHog3QmMCF] X-ClientProxiedBy: FR2P281CA0035.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202161548.958138-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by FR2P281CA0035.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::22) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Thu, 2 Dec 2021 16:15:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72aaade0-5599-4fd3-039a-08d9b5af048f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGO4z/sAm/YKv74eNnzPLrPzsTldTVZA6SPMlTg+LB+KdtvFhM2YKRz7mC/hv4WEpXF2K+NrNl5ZLTLYJT5salQOwhJjwkRxbHE+Z69DjqpSzt8LrmcKCRtSesh09nfzm9NCVhYArgkJGwmJRoGFdf7wOcKA2UEtfGml41/netmVhWB9bMD74fmhDFO/o8UQPc0x3R/Jg9jeK14+y6W+1sLN7xXmPvLmNoup/dCF8a5RySooQN/qgXDvVesWwzzbxabXK5BI45xNdKYvCgoNQLDW4dZio0djrBbN5bCYJAnMCJo0EmJ2gJ+bs9+LdkJ96R2iW2XeUiiCQ7xRSVUQDK5p1AUEsozRsLih5wQLu28HegLFomrX2UpVksTEbxLo8R+k+xsu1ALBd2JwUj6aS6JRp4MCHW5p4SoeIAd71cUGWhP59Lm6V3hy6uObXlIP3zDjnWqHYJ5jNUmjHKTYK1qiwUpF7LMMIYm1Ty/q4eCusHpxES66jAOsTR5ChZF+99dJIH2vhWEnvp+rsTjKl0ZAxCiQjGI3ymEigwGgOLGlb75jmBtvtg2jrYZnVq73gvNLtgnRMJfkNT5vWwArtf7mvrwPx9Keil/rhwIgnNQb7FSogrHTHAZfDIYXrqTYrLQIZiqn4Tw2wyTwSs9qhXxQRsa2O1zRmTnUPLhLY6R46qZs8jId58fwycMItL/8CWO2aCYHG9CjdfxbIizLPcB1SSPuFRFXwK4EZ0QH7SlMWipmoYu7ejn8= X-MS-TrafficTypeDiagnostic: AM6PR03MB3685: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: waUE1Z2fgCCi4j4ETucuI/qZ4YIX3Z47j6nO958SUsJKDvjjDaiyJFZBe5MHcfiRNUWivottNmwXVXQIBK4FU9vcQ6y5tjuCMU6af4MDBFfIY8FPmdXIDd6tDtqE8TPW1pd++lOGBKXbes7/xWd3CGoMPUzuazwzilB2+b/VG9O8lLpGhMdGBRUUCCZ3L4SlS92OCguKgVv6zAJk0Ia9RdxJHX77m3XaBNlfFb4/1cwBW36tVDzhBMarfxF4jCi1BST72879aKlaYTCtPHrSTaiKZIV1D1HhBUfXFAKl1k1l+bTBHnrPYqdRQAeZWJKngPfB8HzFmlbJvCGQwqrGglGIXPX3KLSKdPs6PVAsUTez14TQp3zd7ofMnDO0pFNE8qACiz9MW3VYQVYFCCS1nx16RRX6O9cyrKhi3cB15UOMvrzIApFUWJTqXIPjwBNLNxlOgYLcla7BPNkNrlNG8bd9hBrMce6n8nC+kmlG/TLdt7IuwJzH3jjmDZyeHTrwzGEa0GMzpa63sRzX/gDBpLFYagTTEoPC1eAA/XO91MccwneExiix0CleKtBM9Q94xF111KlV+XPM78QM3vNEzA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DYkNgE+aY0MuQ5Xt2O2hL7fQMwG787Y9ZWw+j0tg33w6fPaOOdC59TtM+olyAhHbqmtVIAK8xHUwqk0kOVa2A4ul7ycTuaVQZCtosrN+yxMFStsgVLYAz4t3HVMUn08a0lWxAy0pFcb8wmANvVc1dCDtdpWCIsKyAYOEfBNmdrvKuR5QSTN8l4p5aM13DtuwCBLImFJSSmm49brPGUGlcOtctJQDGqnQEDyoFqT3xG/ip7t8BUxIqDxMvqZ/jf79K011FCGcrbh+lRNLU9WieYgHOi4y0Veqg8uicyYBT1WhDsElfCvc2F27QbITXkmE5fSsFkIgNwEYTU8Fk11YYV5wE1bGPMpe7/ll37wAmOEdvjmragm0rn0xZ5wQn3P7BoGRW/kNL2GKUrMFKIV1KCUEfxyDVYnpIlEvxVWKDaP+aSwVIAZTFe/sfv0eSdUlkmJspQTfHOklV0Lx8YIQAcFISVwFR/Tng+2tN6NXYgrSiRtRkDv0NzBXuD33SKQBKVb5v2UmjluytUROVyT9kGow5lL1jcW2UBmae4R97RW60MD1v0eTKlpFWq3cSczbZmh1b0MxEzV/7hHdxHJIr6s20EUD2LfO0U+b2UGbtFt+I7Xs0Q1xJ5QCvKUeOH18/WeLujKNEImQdV4otH8VyzfPWoEW2B0a5JG9rXjMZgW6H57EtSVy1DdN7TIhZDPDEBnR+RGu8WCbN8+euyljpgdKQHYljGUatUlnp3Kb717k3bqwc8lrQ54zPn0J0ZBd8ntpxsDEk2VORG3DOP+m2G/qeDJS+XBBq5dOwgG8Q4jnVDyfqq434DQp5Z61+HrAFvBtLcGhKk7KAkFcSvm+UwVr2pPIc0Z1mVv88y4M90Z9XfNpSIOYJA2e0BxV/Pl2riTyz1584xetP8JOxMXlGoC5QaIkiSi6HdMLvdRGpl62EBSvHjgeJ0kdyl1Qy15sFK7d9xGZeX6vP/gskQ9ytg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72aaade0-5599-4fd3-039a-08d9b5af048f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 16:15:55.3302 (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: AM6PR03MB3685 Subject: [FFmpeg-devel] [PATCH 1/2] avdevice/lavfi: Properly free an AVDictionary 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: 3WDDIZQcIDll It is not documented that freeing the last (and only) entry of an AVDictionary frees the dictionary. Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 826dafbd00..d9083ad984 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -150,7 +150,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) if (avctx->protocol_whitelist && (ret = av_dict_set(&options, "protocol_whitelist", avctx->protocol_whitelist, 0)) < 0) goto end; ret = avio_open2(&avio, lavfi->graph_filename, AVIO_FLAG_READ, &avctx->interrupt_callback, &options); - av_dict_set(&options, "protocol_whitelist", NULL, 0); + av_dict_free(&options); if (ret < 0) goto end; av_bprint_init(&graph_file_pb, 0, AV_BPRINT_SIZE_UNLIMITED); From patchwork Thu Dec 2 16:16:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp289030iog; Thu, 2 Dec 2021 08:17:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyb8dUGhrVG/O1VfqgaGOkBM9hFMnhYm3tSANeh9H4X7MzBn5dJ0n9VuLmrolcmExNN8f2v X-Received: by 2002:a17:907:98f6:: with SMTP id ke22mr16179324ejc.500.1638461825538; Thu, 02 Dec 2021 08:17:05 -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 ga42si205473ejc.319.2021.12.02.08.17.05; Thu, 02 Dec 2021 08:17:05 -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=lvX2Mo7i; 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 E6A4768AE8E; Thu, 2 Dec 2021 18:17:02 +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-oln040092075018.outbound.protection.outlook.com [40.92.75.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E35B468AD0C for ; Thu, 2 Dec 2021 18:16:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=le2ovK85GY8xAemUfFa6bc9D6lGEBsZ7BRZ8aQn61NZrOzoi2HbnUNWzo2HnTpvmXqhCSFdBqoiqORmXmq9LZOmabQ2AYhZjv53+g9sWqaAo1WjnMuDlADB3ZFDzrhYOYJfGtNJ+0+9taJor0dFsZqGjjfT1IYOOiwbF/WJemU3m4bIMnChlZ2LgUZzwvCpVzawH+dEgWJPCu2qOYwZNwEZMYucl+6seZI2r8u490xHgZmiPF13zVkkxGJBUTN+GhV+ST0M0hLNw1HHtZGZuGjnzvblzdSSgV+8EFOA0jLE0/bMdjHzz03LhNCRUnTWke1Bye92iFuy4N/M4kCipYA== 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=tu4hQvPWhV9syVcwpdhiqntJZ/dB70WZjsKnbmVOQ+M=; b=i+2VnkN2nVI3Gxk+eZd5PZLIrbSblV80wFSpMoRYoTG9UoKD7a+VaBO6ilMzFff+xJtmgSUyi5UpS3+PWG9bPFPEidDy61zI7Y+nHpg4ODQB9hfkGbvXJxptlxAJIst8s7JzdE+T8Bo67h7I3JhGqqjRAYLUjEQ5K07u23jpNYZopcuGq7IY74Zwat8kNLzQnyWrAAzlyxWkb2naLizCSY5I+Cj+RYWDO3AU2wfflIxsyMMAdvNpZ1qEVmb+fE/wqM2DkZgc65xlv7MRmbEjICRAXuiSfyRVJzYcsRqK79tyqCFygYhz1uIwwItuEc+bmIlSmf9bg42dHsL7qaoJQw== 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=tu4hQvPWhV9syVcwpdhiqntJZ/dB70WZjsKnbmVOQ+M=; b=lvX2Mo7iGdHehuJdoGrzdtUPDC9ei2Er9tPH2GvBr19+XC6egnCxvFlblP0/nENFJkEgTwizJXeyptGis43z7KdmVE5qC3MwlY+49brXd5dryFXh99KjnWc7w3Sqm2wAKza6fR3Yh09ih2Uj4Wskv8Es82c7abgYAmqNzdy0AG23kHJsdYpFslTClkBFs3X8FUwpxsfthMU8nb6sVxwl8zRiQnKHJxpvXoax3azvlQuvOxzVsV9A/4fjlxnbyU/D5IliJP6woc+6wnomxA3WlBJ+LIQsXqp1GAo9JiNk2DSRbqGkWU7dmlOGKwjRbxJ+YB5SWew+GlQL6LFKNL/Spw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3685.eurprd03.prod.outlook.com (2603:10a6:209:33::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 16:16:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 16:16:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 17:16:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [uifHPWk3zd6IOR4D+lndwAI36SddLxhb] X-ClientProxiedBy: AM8P251CA0024.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202161646.958210-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM8P251CA0024.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 16:16:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9226916d-eab0-4a5e-7cca-08d9b5af27e5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGO4z/sAm/YKv3pYi+TiPGqe1GjKzk3Awtxt4ZbmPGB3pUfTxdqfyr0dbW4F82rlcWs+H3FD7pPt9DzRVAh0s/n+ce8hfSy1+W2LIFxtdzekf81rmcQ+W3X+l/4iLby68ufvb3EgzMJiNYrKZ1uP6oXTX1+Qa3ePpiptGUJsIWpRfYmBOeLA/Onk2b9TEFpThymsNjcdgZ/sdSf5W+ZfSjNM507hDNZuSqLB9RTGEVVUWvPlHgGJCXJAV/nMp2qGSqw2peIVlt7bJsW5Ea9Dfuq1bz31WMXlvyydmtOb2JB8styMsLLClw7gMYJ4ICZauKTnZRUSyEGHpZDtpPWLwhOkVOSkxFlcrXV3ukSGCk7jK6b4EqWglPplshanTPmWA/odPrRVZ0ICW+/yqTfkFmTGqnmRNHOfsORc3L8R/5xpAZ6ni5Pk9yA6HZsPtHngsdfZH9sjq2vQzSUMnieXqUVL3saNsu27K0XgQApGY+6pIj8pym1hn6JO1INSVYpilyUBhJmv86ttZefTJ3vdM8qKke0mCwgZbRj5AuJyEtG+xEOMmbdChsNsMpYcRhbOiZ+z1mvBdQMhN2D1kVUSEXJ8jlAQ9jqUNvGcaB8KyhlipVzji2EgYTo77kmuH7Fo6pKux6Qb4xExoCl7mXGbW3TraJuFCeOQf2uUrOAfXgZFEqO1Y0vfLbvudWmGsxEhI9XIPC5KfJ2rUXgQwNig+FY0qB99Kpdo98tYKE6uGrr30LJIcfFbye8I= X-MS-TrafficTypeDiagnostic: AM6PR03MB3685: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p8KkXomyQKS6Dxj5b8nWO1xWRyvAyITLhiZ7BkHZduhJu/DtR45MbAfRdWCoPzkXiF0mMtyjBUzxJcZzyXU0EP0CPKR4FAKPAx+/yDwUff1Nahl6Jj/3JUg/PYjrTqDA75HATvwlMbASiHCEpQPfBprh+muUsr1MQ1gOd48omON0+PZbsJ5BFqgyY/uPpQtpzdQJmO1AmhC7JV3yCVZqpSwOIDE4Ip8lGx5fHeV61i9+Bk8R9Vpw2/LwXLZtFaaKdPOQ+kIsG5afk5IAeDq1Cgcoz87ZBQCuIAeyK7JsGmobt73kqbQKVzktsLR6LT55KJLxURXmaw92q/PnNmQteW1Wpg8lovoPoLV5GVMqamU4YTxfCDiR/rEZdr51BIRqSaGVMMvXpuxupNuRQ5owwJjYPVCyFklJxiPruJ+C8v8F/neFirw2nfd41w4rURwdvvFEHxigOhpX74GBE/1I78Ivg2ea+SZeyDCGhgVx4NM9N0PM23x7aFn7eGlj7byJbZhjRWsv+yA2FX7JcnYax6Sm8OnZw2B8BwrTUOtkr4YEezrQm6zymvsF07fSQmbmImYZJRAOWo2LPGZpxyC7Iw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ziu7z6SUxRgK4t2od0JDnPrKkd9PWhe6kbIeKacSWWz5KLXwWdlFL8Z8tZoXuxx1r2aYXB4maG3iwGZBwppWlf94GFmwMFMJPrm0KJn+oD4dtcEMr99svlTdftjaw14w9BYpC1+kL0XTf8gdwbutsDnss/3DorgnBGMW6tbwldup5H5V6Owze8AVjk29VwbZlkzIgPfx8X5QH1jLc9LGB3RqvGwSQOMki4WPtn4LUf1yRXm7513+rS85hPvKz4jIo/bzpsNiCrlanQupUCnSfxCNINp80c5qIUSNkHQYJVSprVpdDqPTWt9yxrE/Od1ZmKqEVJneOhim9w1Bm4TQtYT6MXR2d4k3rYBDftsgEF5/EG8R/f969kzArU30bwN0pIvrkW/qovsVdZcewRBv9qAoj0/wvDDBiLM7lqX5fSGaXiF5ZlnyLNv1AHgCIdORbBwQg1np5WeX8mfLnJ5jj5hfAxGNasf2YWJFI4Oe1Ya8OiJ0BzLrDmdD22f6oTzKeB2fbHr7oC4n1CgBZeHkfhcHYDoP6wO/o6UomSECSCh/GBHhvhyKiTYn1sl2dllfQ1X4WJWZ0C17FBEcapPXK+r3Vf/b3QA0UKK6IGvyk3iwBwyGmLobo+hp9Gdx10OKCfLYzGyxaTLDYoGR7DOL1J4LiJI+xwfLbEZHJp+omh9ViL6C6v9npXRRLDzSg8eusbPAmpGhWhI2KIbaiRABm1RmdZVQaXAcvZqrLlXXkDKprLUFGUd4+S5b7VIiFREVyJFWddG0WYi+Qbnf+b3YUdznmXDDxZEbFs8vCRYHiWdxb2ULo9B+as0RP42qrxfWgttCcK/1/jG7p1uM8w/c8hmLIZczI4RHPVkuXceoYEdZVF7ymyIIfzZOclV3CMtAjx2CHZby1AWPrPFSv7JcGPfkz/j0huDYg/suTfA1GKfNRE+gJ/VEbd29E8daB1YiDYm9y4yeDpihJ7185zyr1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9226916d-eab0-4a5e-7cca-08d9b5af27e5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 16:16:54.4765 (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: AM6PR03MB3685 Subject: [FFmpeg-devel] [PATCH 2/2] avdevice/lavfi: Don't unnecessarily write '\0' to AVBPrint 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: Lvv/CfVyVr+Z An AVBPrint's internal string is always already zero-terminated; writing another '\0' is unnecessary as long as one treats the string only as a C-string. Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index d9083ad984..2659c8508a 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -156,9 +156,6 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) av_bprint_init(&graph_file_pb, 0, AV_BPRINT_SIZE_UNLIMITED); ret = avio_read_to_bprint(avio, &graph_file_pb, INT_MAX); avio_closep(&avio); - av_bprint_chars(&graph_file_pb, '\0', 1); - if (!ret && !av_bprint_is_complete(&graph_file_pb)) - ret = AVERROR(ENOMEM); if (ret) { av_bprint_finalize(&graph_file_pb, NULL); goto end; From patchwork Thu Dec 2 20:24:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565352iog; Thu, 2 Dec 2021 12:24:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzh6hNorPF+LVQTR5kYpRS2cbiP5xSWG5xHtx28uV29FOVqBtq1QQ87ZCHfTdQFWDCMAYtH X-Received: by 2002:a17:907:7b98:: with SMTP id ne24mr19317972ejc.14.1638476699220; Thu, 02 Dec 2021 12:24:59 -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 r9si1442193edd.429.2021.12.02.12.24.58; Thu, 02 Dec 2021 12:24:59 -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=gVFR9EzX; 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 A7B3368996A; Thu, 2 Dec 2021 22:24:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (unknown [40.92.89.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB473680C85 for ; Thu, 2 Dec 2021 22:24:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fpBH5/K0PMoaePdPP5Sc4ZoJ8GUKQfTiX5r/0m2Y2oyrnwOoQuN0ifjqCjEx7Zp4T4Nio8cFdie5DkwsbaOkGXzy1cA3UC1WuqfRZQM2isXT/MSo+vtrVFqi+n6Fs1V+0wNDGM2s8as1QG8S2LOyavXV3wmNypPBAc7fZanwi/Dv95mwTUrgr5cSMWKGZZ8CgCmbjsNFCg0zObGLcDB4ahqzT5FENEucBi5xVuvBqHoWNz/KOnSeQvF0cmLvhL5G7MiwTcs2AWpk0l8vCoU3IJZ6Slw41UKik8vA88Nh07MjfMVI7gVzBo5N25FdZNGiV4gR6xuDatbdKzLisNK8vg== 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=jJTCXi4dVF8bkNJFMQN80y1MBYmq0gnbKMurvhD0d9Q=; b=aUzhgHIR9yBcYI61TARMh0ps0Umv633KHuG6/YQjwpv2S9HKVAwzfS7usn9Lhvp32aYixZOXM94h0iuN85PJJp8S04hLhTMLof8Ds+F+acW6PbeGc2vSgCdEwmI/lLhHtRiO24A0aGX8vkkKeVgezaig4qtyEuDmHyj3RnwIv3WrOuPsAj6qLTD6CuEwkyts+llaymQoBDXrQai6VLR0e51lEZG4TfcoX+Ee78jyfcwtJpyZWH5LteuwSH+X9Z4Q8U+TLcvrgwAXSffBH1X70shAZkm9IiPAaH3Ns25ehTuOMgXwEX60mJtjLRL37WTnVTcEd+O30GDIrHNG9VViAg== 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=jJTCXi4dVF8bkNJFMQN80y1MBYmq0gnbKMurvhD0d9Q=; b=gVFR9EzXznn8shmukFmHF9HrLW3y+nrd83ccdrek2RbHmvfZnV43gyd3aoxliLk/r0FmD4dojDGoLKVjm3Zynbyn4ovL+oAAJd1Z3Z4KWd9GnPgZDNf5oWmJJ13LDy5U8FdZu+YWp+q7ADavlziCIR+xnhPbIherreay3KTvL+GPhvoqf9EPyKYQ6EWAS4k5kknjR/xknR5NyVCb1Juy0DQ9faHRYxR0wmNtDSKgXM2gTb+IZgREsm3hLAYn1l56EHCKAcNJccc6SS4dWD3yzIlCsPs8jsRKKAIOCD7mYK1EDphFpdTEKea5oqdNyhNlEy6i6eDtm9F7cbsSUsgmug== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:24:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:24:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [QAqkUhyOnDqQCqy7Y6wZrNkqXWGkV7Gh] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:24:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48546fb8-568f-4063-4098-08d9b5d1c906 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/aNxG1BBgdMbzrb6luDsVmfFuul1uZsSxa2MZBewmajhjoF5W0TFQJXFHyAu6PeMfWwqCsJT5UthLMzdozHmpz/b+54F2niFnbvyIVmnS9k1A8KIauzyTzRR62HoJg8/hUu6F0NQxzfWeue9KFpLDOMCrRLWKly52KhDgzRf5RXFfAuQtonEraKizVn0A+i81hy5ZMmz1MwFm9QLSCt1XIu5BUYElk693nVG6sx+WMjwesGkh7574yj7NTI5YODFWJKtcAZ9d0PUWGKUxQivbJFiNyrml5fa/h2oa3uhJy0Q3wOJR/YphyLdAPxXjMakWlHCaD26/3OKp1h7wz3VqW2w2cTioIEHqIVI2BYt0UYkuylTpRE/sybqHyXPCnj9fgjPUW2gBb7BX5eFlauSoopkYyLvyzEJjJs0ZB6CXbWEaMYsXcrc0jZz+560UZHoWARizwaWLKjRvnIrewXUuBy2/EarC7ouUIEqjg8gL833KFhON+xgNdvkwU1Ze8mwSfLNoHFS1t1ooHgN/3OJfkIFuzhTlvkHPRt10i0Ul7CrRjYKhSSH2H6sSM51cUAx2ChcRhX82yFAHtiSB7B9wuifVOPh9gBJPdfIc9zUj886vSGcoqfclF1i30QOxB3tJWJbYoY4ThGPDcgWQPAe/GfjamcIabl0IC2hEGOCAcRrungeom0y6FM8Cov7CBMMEGjyzogl1wHfrqPqGeF8fQDreBdkhd7pIZf5CvQ52azc= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aB1w9bu9ma6la/FHJtud2At7mgHZF/g2PJe7bjL4UTUe6WR2qCPzTfLTzVPnUdY6G0/KEay+wa+BxsXE1XQz9TvP/ZQV+dVoDdVxT5i5LMl7YvK2eNNtIVXdnLC+Bn092Pcyv4jp8bgRdDazH4g7ououM3RRXt0uKSoErELbs74SiA0b5cAXD6pbKQ6jqGlvRRrp1mlo29jptFwo6544bMZWl8yaKT6HCq/NoRxdgaZQzze04OIe3CTPBaxrR3/SRtWjlsYhKwR4SWa4e5nDWsVi6CeoEObLMlcjpkU8JA9hH2b/ulmAURUEsDWa1Y8q2ybNyihPOEmhA2/nsf99EuRyM0Lg85IFFuW5JMrAtmyDMklwMl3pe4DFnoe4iz5VeCLnJFICEUr5lsqvBnw+D6pLhusup+By8z9lf01GxvlZAoY5FizBR7yOJQVnfMF9UWA2OsQVNHswUeXF/gM3XHq2B98O9aOi/m1aQ0ygeVPa2F9DXc7tG9g47FYWu9LfNTPrWzRYHcIGvjUmys0S4fY9gjDxUpgfgPSIFlw0/jxBlzIvAEpjpi4TBU7pN95Q2RTEBo0tba7u5DHGypsIyA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rReOWQfC+MkSn44poyJCN5N61duDid6CbmIZHA/BviMZ6et86kd2jG6CeBTCEasEJP8Zv8T2EP2IeB5TzV+DtC19g4Nmy9CCN+4/y6rYdvLiu6InZvYwbX6qeD4Kvxbcnzvn5Ti0n712IdcRsGuqGcKlONq7HyBk67oPEk00aBoeuNeOTg4YpllTCv3bDvmoDjFlvFrTA1DHwoJsTOVzVkV9dfSsIzpIagLcfamYYo0PU3rYJTzYZcQh+BMONE8bMKWadnMMwfW1r7gdnG2geIC9msWy0ZuyslbIEG0uo/hbB2ICvRkPAGnZiv0pAG4c44mNLc4Y5LBCe61nYPNWp5oaQefBz1N4Qlrz5aHbkkvj/aaTyfWkOJgYUFinJjLgH0wQ9P1RAXheLu5+lUSAZPArhG/vqFnQl29uzIhAqhoPD+PSQSDec5WtEVIcS0mvyYSEBoBovabeJEGrhfYQybNWhzRRVaud0p6duSgwd5oRTsexIZ/cxGzf+W5wsC2BhawzO4ic2Qgben6L9w0JduJ6DvaoGo2EtO33m2XhkS1Fz3HgHskIV1YPKKGERa/r9l3nu1m+xiB0KvLhUlUO1gsRwFN3Nskgr0N5wWU7crwsMwjxdDlaJAiFSa0WCbUyE+IkI01qHqjVfvG1E7EIzyIjM9Ocs5/KmKaOee4qFbD7u7K0YeDiyl/LQqJFQjTMVZbc/6557JT0rbVOBuUksJ2RQ0zbz9ua5GzoeUnkWinOjp+JD575GlCabKKIFEnGBgzAGweQ8qTXJXXXX+rmVo6iQspEXqlJrhTgct+ud6M1Y+rb8rs1xetTCOwrizbNuaVnRG7yDl6OuDts97hIGtQUFXgrl1v79Zz5rkK6dEEBtsMb7JamsY09bouDjl5BuLbcxYfCqcwYyjBiWzFj8P2znrxC2Atv/odMHB4N5VJnF+Zz7qN0bJns09SBxdFYdH7HleYPmhjMtQQ7IqIwww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48546fb8-568f-4063-4098-08d9b5d1c906 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:24:47.8026 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 3/8] avdevice/lavfi: Use dedicated pointer to access st->codecpar 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: 7jFEFD0Vz6xM Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 2659c8508a..209ebed5fd 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -317,26 +317,27 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) AVFilterContext *sink = lavfi->sinks[lavfi->stream_sink_map[i]]; AVRational time_base = av_buffersink_get_time_base(sink); AVStream *st = avctx->streams[i]; - st->codecpar->codec_type = av_buffersink_get_type(sink); + AVCodecParameters *const par = st->codecpar; avpriv_set_pts_info(st, 64, time_base.num, time_base.den); + par->codec_type = av_buffersink_get_type(sink); if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_VIDEO) { - st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; - st->codecpar->format = av_buffersink_get_format(sink); - st->codecpar->width = av_buffersink_get_w(sink); - st->codecpar->height = av_buffersink_get_h(sink); + par->codec_id = AV_CODEC_ID_RAWVIDEO; + par->format = av_buffersink_get_format(sink); + par->width = av_buffersink_get_w(sink); + par->height = av_buffersink_get_h(sink); st ->sample_aspect_ratio = - st->codecpar->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); + par->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); avctx->probesize = FFMAX(avctx->probesize, av_buffersink_get_w(sink) * av_buffersink_get_h(sink) * av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(av_buffersink_get_format(sink))) * 30); } else if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_AUDIO) { - st->codecpar->codec_id = av_get_pcm_codec(av_buffersink_get_format(sink), -1); - st->codecpar->channels = av_buffersink_get_channels(sink); - st->codecpar->format = av_buffersink_get_format(sink); - st->codecpar->sample_rate = av_buffersink_get_sample_rate(sink); - st->codecpar->channel_layout = av_buffersink_get_channel_layout(sink); - if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + par->channels = av_buffersink_get_channels(sink); + par->sample_rate = av_buffersink_get_sample_rate(sink); + par->channel_layout = av_buffersink_get_channel_layout(sink); + par->format = av_buffersink_get_format(sink); + par->codec_id = av_get_pcm_codec(av_buffersink_get_format(sink), -1); + if (par->codec_id == AV_CODEC_ID_NONE) av_log(avctx, AV_LOG_ERROR, "Could not find PCM codec for sample format %s.\n", av_get_sample_fmt_name(av_buffersink_get_format(sink))); From patchwork Thu Dec 2 20:24:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565536iog; Thu, 2 Dec 2021 12:25:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZC08td8r+ain2dGKuFoL2CFv3ibbRaUl4oSRa3DSWpzAxBHVm/Ux4jdCyKD5/Pi46hEmW X-Received: by 2002:a05:6402:b23:: with SMTP id bo3mr20149640edb.366.1638476711202; Thu, 02 Dec 2021 12:25:11 -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 s13si1254832edd.232.2021.12.02.12.25.10; Thu, 02 Dec 2021 12:25:11 -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=s9LYW2t2; 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 3E40868AD39; Thu, 2 Dec 2021 22:25:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (unknown [40.92.89.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A47F68AB6A for ; Thu, 2 Dec 2021 22:25:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEuXaKEpxePcWz9x2Qz+wcvt1ep1NNid9MASfCAan2KIWNWnz/XAZmtEYREbUD6pBmxHg9WSQoaeTQ+7vyk8XnNZb6PbL6RwwWyPw0c/qhfdlxveF4FCPDLu4JJlriu5RD5DXJyLj87y2CXJToN7qFSak7UBexPeYJI7HHfhnOabgS1hSmh5vvjS0R5H1e7NDWLXOv7cLYoVEVe6HdxtrLoJ5FNCDwqesRGW1ZgveicRnm0nnI99lD4nm+bHy+RebWahs8lWPmcJaagEirbhmyih6eUO5qpN/qONwm6Pi6aiwL3jxPUvNRlRZrRvYaQToWekb/L63SDgrSHOBZhtLA== 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=hIOyUvW4RAN4i3eM5AfzVIUeEQm0HwQM/EK1AiO3GrQ=; b=Gv70AZeeYZdtWCLmaeCyBSAap++aM0KeWeb5iFwRh8uB4uuNotzQFshCRCY270bQdK8CkZITU3izUKnsPPj3JiUnih1dx0+28tJofI4L8vXdD+SQcK7lbp8xz5h8eM49TgsqBAUTVCUdQoRcSIygcMfMxm2mhCeZ5+D5pL0O9PI7mjAXTvMBoo2e7v8jlcxlkcmGVRKLLFDaMikq3lu/+usFhz/AOONrreEE8EOvLKIv6UR36rIFZLVGjgkpeG0xHbSCmjC5BNM01GDyX6KBQMfAv7Yx+p38ZX52lWYh/c3tY59fCgf8xcryV95DIDtWAkpHvFtg9QEOht4U4ss/pQ== 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=hIOyUvW4RAN4i3eM5AfzVIUeEQm0HwQM/EK1AiO3GrQ=; b=s9LYW2t2ZwchMCz0b+tBqiimAX4VUm3YE2U5/+W81NCoHV2jyg9u1kKOueoWRCa5d928gH8ryJ/Qbeq2VHhnoy0sfLWt4AfPk0U1xs9CTUHU0Sv9Bs+Ae9H+6opyMO9eY+q/ckOEl7cSc7Rj2zt3dWpZ3hPXZAQ2smjCL2RxzrGdILJgAjaFkiJYYVJzk/xoodTxyK5Ypsqldq9Y8NLTzqliEklkLU+cPONyDHykAla0qrohQSulxQBgPEElLeKk4R7Snbo2JD2JvyRTH9jbfXA25C2xtl3jM4YAB41MTPft//haIfJykLe8be1vQglZcoNBrANGoSO/yqpubJ5VCw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:24:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:24:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YaEA+yAY10s8p3JJ7OoVW7tQI8GLXpUi] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:24:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eeb71a57-33ed-46b7-c943-08d9b5d1cfc1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/BFuhGrGcvZzvZe67RpPV55i6zZZ8MQJc4MIqkb56iMmIBVdnIl2iaxnjC/CXpmrARWUCRbAmAeZVlbbA+NaocWC/BF9pNBcNnevAHCW/cu622WeQariYUJhmV4/eChjSlb6J3kwEfvrUgpvfUt2USp5ejxey4/dcJ4+AqO6Llv7y1HFcfwZLg/mrhXmgK4LsgKtD+IQ0kn7WCJcgo9qEK9MosPZwUZ/b+Ue/cd2jeb2mMK8a7wW2cVn56AwSiu3kVZ2X3NSCQR6BTnL8y5rAj3EwTHxayVPMxsC2l9Fpul71K9FrArtBFRBO4EXswPS+dtZUkFLk87KPF4ciS2KdDMo6WrqJY/3ZbjCQEeYvyxgq39eXPOWto8twGVcvK3itFeNUJrfk/QGQaFyLv6qRansVRHFLwHRHJWPS5mT3Ry0UuS3lnwhfdGbxfuD7hbXYvG+PuQRzzlxjIbBkJLRAzp+WU6q64oWHyy6mWb7bN9jUDSngMj9m6BLOUFzzQtMyeQ26HLs5M2RxJI+uLop3nN+jLwDaEJczYVOyBMi8op3FULeglOa4iLAP+mWTbQeBzWk/Z2grGCRnO530taHUhVwZnbSJp+pzVK+0BmaSqrWbkZ6w8Gqqhcd+8EFGFSmZ4O5efShcXjKKnem9g0AP+OK6xLxq3yksv1R7Q1WjnKW9sPkhbOvhgq2721IEERqqIQYxyzOdAKkBsS1QacOqqrqQUcAq15ZVVYOywxM10RU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rexJPYlxBMvNPbtek8DLsEp1SBl03AYNRgmYvyx0UW6zMYHVJ1NUmtzb1wTz2s1eQwPiebPdFueZFh3iEa4iS80KIfxINsycW/Lr7OZZI0u4pemOavcJfyJNHTWRTmSws7Nd1JSEvPOYeApAv7pggAmr6wWLWEJPtRUslQtb3gV7RCsxbYbOqKt1K0CozTcnB/uvVzp2ztoNk1lkJ7qXBJKWxoEU94KT4VwpKNPcU7YJPZYqZigUl3lJMWNSIOcKW/J7sOjhy5K+qF8+4BgdbA4OpjQFymbwsC8AULNsk2XeigHXwcN/O+hqP72+AURJolHMLKepAff1uSOO8ra8aGDHmzw46x5tpDOMyzogWIw8WOOeOVUyoSrE/c6pn5k/zHyJeuhfNgZzbChxqHbFOgHZczQ2y87T5QtvhwW0nTCgRlADCD+WXS3RJnoG6YSx6bAW5CYmq6lEgx5EG9klZPl8StThFyHndDeI7HScG4y0XlGeRTSmcxkB7ZP6aphbW99bvq/Hu7oyNshfNc0Mg0mpc9OpZtRLsWAm+5muVBA65CIJfBMboPIY2qa9QBd8jiGt24y70HsM/iEAyLnJ8Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KrdFicyo6by+CPaXlDKXMl9SZBu1MsZY4bvWzEgvBSrNaLhAgdrK3DjInID62G2zQcStFh4QNNMbgho7T0KxExEEx2xmRcJPD9sPEjPb1YUj6DPvZksMhYgv8SQp94HejUtv2W1nCjlF69iXB/LWQo1L8h6M2Ld4tIbav5IE960qKeos+130Z5eruvsq4qaNxq39GZvVtvWUoprXknqqFiByD7+Wb6GdpkN6EhcYhuAdS2QIKjjSEZb/QgnRZ7SkfSC6PFhd2CrNW3o6LCQmxqPiLQJl+wDKbYLtp6ZlQKW3L7tdcaSrlKz6xU1jaAwiGSO53oLFPWO8rmf9JH6F+Q1peIIZ8EzQOsTqj60c44fwFvu9TaPr4turCokQM+O/eBTAd1cPpGiSBbx5DQ4wGy2UoXJ/i0bUpC5hwWtYuGIyuHsdy1YcRomhBN0u28Ate1HPHCyyc/ZAGIVytIKdoR/bb+AgXjo804d2gt+RHRKPMphP73U0xoY9GsOAZOP06CzWQo/utXKRxXXYm/7qqwoh+SmOPB6gwGj9Ms24zrTqWHadHIFm+XMizdMsgXmTqPR2S20cnkLiyCtP35BKZvIgTe4gLTDaxbzU1GR5ZXYffMO+C+1PsHiVQtvNRyP0r39f6O00EaYuUKBLEHGm7XfJwMy4RKVCtJbe81EYYx+bp9LI1lXBWAZW81xpEV2FJfYtbUSIfR8+17RIIniunJiFZJQ60gTeF6uoNOr3/w7Dbd74+u7BrwiS1LV3UW2emxRY7JBI9Shd6qpQo9tC1vyNfLBKnI9mrqiwd3AEvBVlTkoFImjWtzWGCqpZ5cgaIoZK4la7xrbkB7L9zQ+mvjg6/CE6aPLy75JhfZ+LRj90VK/JEke12sWOtKA2dUOCzfTu8fXbEzajx2lOn3OblMvTu2tjG5JZ+ylN4eJwZGTU3rqgROIG0agGDddgaNDUjzjB6GL7/gQ27fnh82QAdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeb71a57-33ed-46b7-c943-08d9b5d1cfc1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:24:58.9730 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 4/8] avdevice/lavfi: Avoid calling av_buffersink_get_* multiple times 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: RO3Bt43pEILG Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 209ebed5fd..878bb193af 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -320,27 +320,27 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) AVCodecParameters *const par = st->codecpar; avpriv_set_pts_info(st, 64, time_base.num, time_base.den); par->codec_type = av_buffersink_get_type(sink); - if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_VIDEO) { + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { + int64_t probesize; par->codec_id = AV_CODEC_ID_RAWVIDEO; par->format = av_buffersink_get_format(sink); par->width = av_buffersink_get_w(sink); par->height = av_buffersink_get_h(sink); + probesize = par->width * par->height * 30 * + av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(par->format)); + avctx->probesize = FFMAX(avctx->probesize, probesize); st ->sample_aspect_ratio = par->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); - avctx->probesize = FFMAX(avctx->probesize, - av_buffersink_get_w(sink) * av_buffersink_get_h(sink) * - av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(av_buffersink_get_format(sink))) * - 30); - } else if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_AUDIO) { + } else if (par->codec_type == AVMEDIA_TYPE_AUDIO) { par->channels = av_buffersink_get_channels(sink); par->sample_rate = av_buffersink_get_sample_rate(sink); par->channel_layout = av_buffersink_get_channel_layout(sink); par->format = av_buffersink_get_format(sink); - par->codec_id = av_get_pcm_codec(av_buffersink_get_format(sink), -1); + par->codec_id = av_get_pcm_codec(par->format, -1); if (par->codec_id == AV_CODEC_ID_NONE) av_log(avctx, AV_LOG_ERROR, "Could not find PCM codec for sample format %s.\n", - av_get_sample_fmt_name(av_buffersink_get_format(sink))); + av_get_sample_fmt_name(par->format)); } } From patchwork Thu Dec 2 20:24:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565730iog; Thu, 2 Dec 2021 12:25:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJytU/MhyCrjVNrTp1+0HWqZF4+TF4cUgi5VJafxstnITyP8B+farsoB99eCen61O+NEC2Nr X-Received: by 2002:a05:6402:1450:: with SMTP id d16mr20754885edx.144.1638476725396; Thu, 02 Dec 2021 12:25:25 -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 qk15si644069ejc.136.2021.12.02.12.25.24; Thu, 02 Dec 2021 12:25:25 -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="p/1IedmG"; 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 5068868AE3C; Thu, 2 Dec 2021 22:25:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (unknown [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF58968813C for ; Thu, 2 Dec 2021 22:25:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gInPNcpnED8wmhhxDlwv29D5mr1KOaUGVcuoljtS0ZGloHN+MdXlhg1Q3oO2mjrVUdzg7kRCHb6BVRAgoBCQTRe1kRIQ/jMQ3i3NNcmI+u/1bgaqMGrIqJLof0kneNlwGCerlzDG4fEOjbywCNlr/G0o4GzmilFXZ6JEz+Ral6b7BAFqIzwPaGyxexV9ugQFTUuruNpex+GwmZzvBPcKVTbbGOIbb+EexP8+UrP3lu5NjpxENLfUUA/EH1EZYMDQ9fJ4Nx1Xvt0Bbv4hOMjYAyIVOutjeG9Sx6Se22Achfr0cnOQ5Wjm8XCp1Dk93e10yVpfo4PosNBptaDzXaho1g== 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=fP7QwSrJ7akdw9F338zv7nWFXQN1SPZbWLE8a710LXI=; b=hSAT/nA5+OJ122Nc7q336g+JHcNGTVnV6jPZb2QG4j5/ryqp8GRItwmD/FjnKz/MOUqxAPIq0TXdgo7NO6DCWv7WQBfQK3ayjXI5t20odxRCU/50YZekoyZyoVmSXPaQzuFm8Q2OwU13ttyiw8xjPRixE6Iqgbh5McnG6VzMhQ70OENaM+Mm0tn+24r0CQ67Af9+Yfi+cVpyN4QHiwwg/P/RpUemh2ofnfPCR6kppYTkW9ZpGhDTH6ytbnVd8l/fQW4Fvf7OwUHNyaQ8H3OVK0Egv3bc6LhpWl8I31S63wF7yzWUSdY6b5a6iXVE9PNXCVMVL9fyYOurMyo32j3QpA== 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=fP7QwSrJ7akdw9F338zv7nWFXQN1SPZbWLE8a710LXI=; b=p/1IedmGHSn8BVVLs0uP9tSJxSIcZS0BBk5sVVuMOgS4dt6crM0ir50R86ICwKt9fQvgP7zBtzvG1yau8RUAmGdxSh+8UX2TsH+ugob0LuR4/Q1ijwwbA769tD4eIDZBmrQlnMxAwVPl4cLEtp5YSrw4wNwP7vYDNItDMvbccvXkNeNjXXIrz9S3h4XBVTwixb0tkDUuU58R4xQexJRlDnSmeqBznYGWXsxM1DrEXlXTWGeLOWkIAiy2aXn20Zyq4hO1i41Or0A/mwd7j8OYCbQPXsBZ2iVHIUn5orQEOu0HVpiFsUr8R6uwVe1l/n5EhyHpjSaqIDyn7tqCXJlCAw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:25:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:25:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iyciSxzMOcqth8USqXRU4kA2wfxiVY+f] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:25:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ea5f677-1c92-4077-b8b9-08d9b5d1d85f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/BqMe1JoCYMm8XSop4tLdPNyl3yVcuhF06oyN3sSapkoJHHwtXjQQ3ILJu8h6dl8bv50EoYY/hOyRq54+pzheucMSx5i0q+YL87fBzjqbjY1sc/wzf6RH/SiUwNR6A3gLDn3LgmHlRr9cp85ZXKRPYUFRSJvK7zP2SkX96Z0dJbh9r6nTRqaFsV/R86AGLxS6VfeLh9vYgx8yZVqbydfDT3/hDaLRFgWiyvI0ji/DefIBveBlk5G4qMjpcoD5rRSqXzRRjtuYJ03G3hA1x6yDBx76oWb8Jr94aaAPT3aGbrgBxQc3gtYy6SIw2r5fEOfQKV/4UBooNh1czI1bIKcsDdQ1jh17hS6jIiYZ3GOz+WcpxIcZDOwkHYlCaD3TV3XRuCGMTBkVEkayILwn5b7NksVtPPT8vrgTd0+l7VPw/agZ2w5lJFjrlIELFPnTKrVz3yq0aCHIhhwPJcQSqFFwjfoinpNVmEfkJNq5tRxQi1Xp0N+pYNsN75pYvkvW0p7BJp57kCowXi1No+y5g7I4NSZLAsp8yJ6VKDZPm7tkEOQSD+SQ35Wozn/A3Zd9wTSIMyVwECHtNtqnLqxag4MUv3V0O5wfkoq6Q5I89j5Wli24J8A3Sot8JwlZhJKJzU9jaqjKHU57UVwBSyxXZT9ImtUYYU3RW993YJADYJVWwHxn2cTzlZzAUc5gRy2GXgKwPsDxcdba3cgbtpHf6S1jfYkt+w2Tv0G6rT42BL8Zz+k= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yE3XhHeLnyFO0aPxb3l6L5jfqkRom4zKKjzMIxHZY/hQM/LAKjh9PU0AdgvttKM8ICrdbbN5wi88PW9ku9PrDpD9A1148XYDoNa0anOQYWnp0X3jj+SFmJFyWDMk5l1BnUmbN0rUv2c5FTMEMTHCcj1gFewJCAQkLog4+dU3AzMEPtVr7Ltvl5MYYHBF5j8qHfVWqRSqhA2GchD4zwCI3j8p/5dvdJvi/XZsLcfe8zXx/IXWjavQ90jy3W103nahSgr97Bfq1ytJ2nEdhjZE+YD1b/aBtem+kN5XjP/ArcT4BmnCYHgFJkN393d4SD09Fi2lsFuqDa0OZ/xVd56wrjJXLauXSYihamcg9ngQ/I31BtMyyYiMsYhlnjrXnIdlhGCdRIZe/B645O6O1fNtcj5/3ejVdiD4sZ5PXN69g4PtzOCF/o5xrBAAw46LSvrzCLvOmJt2dJjVJSDrQRhQf5PzTuKz0dTkd8UYRqtCH3lfgu4qEisahsqrW+g1RCPKREzbRBeFhva2BmFudWO4X2yT7fZuLAzSufuZ7Xes18vrWHX8wyqCf1gI4B7SGyOm/WZQ2LZvMGSGFzwM3aOTlQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Sr6s4gAoij+RRyZl9un1W13+KjnatWUSHL5oMrG9msJZUzXdRLBv9Ra2azlX3FmJHagcgk5xlg7+BifYLxS/bDXzNqcUo2R0qsrt252nc9A3+tK7RfDTPe0xUDoScZry6dSROwsP1WqXrHJBhOOocqGZM1i+k3oiyC01uqrawzuQW02kM0qO5+F21UN5yEdCxteq2+K22W9G/bqybLr5zIhghZb3uYoj4UbW8talpQn533L1/nvNONbU4nMNJg/qtV6JKefReLuyWb/Sl23fu06rp4W07x0ZcdYT+fDA07yac1CrxmposcWC3gwnLyQ4MxKBHVZ6PnnVBOGnxsUIciqtPFg593KZjZns8iyyZkLCiJnrdx9Ni9Ce3r6oamTMRzcYeoS1OCJeDOyn/HbUzrsUdctgeGaDd9jd4LG1BOpYHFW0Q3L+0dAUK42qCyNcUDeZzN77aj/WyXr2NmQJg4lE66e1ditg4v1JQMHzVDAPeGUXJlJNaF3uAtG1Q0s7i95OXRtqN+sMFJCIZGh9mxoFbEBMUiRy4503CsjZNQPo/0EywKZXHb9V/NT5HjwqkzwZ/gpJkdG40kmJhjrXsOGnlxUNte7rWABajGEl8+7TJMk83SsZD3qzbF4d1PTkWE6S/ImtwvFdjr8t2J8zBOHVzUs/U0W/OvYZrtvnLmO+hAXN7Usn6e8++OqAAyCO4TRqOUThFZoRNJbX0PkMfcx5UK/Ch3Fju3pJHyLRvtuiUagEMT/dSKTo9tBD1rX2/sFCIPezYm+H5ROetlzeSdDhIBS9uQJDX+2gZOWX2t+M+Cci2H7ugF0kgcDozUSk0WmCtl5w47tHMV0m17UoSrtpRCnYS8vm4QG4EAgnsuk2go4SAnCb6+Cxhc0doWCOP/ou6l7NJGtJCIh3kzRNB1so4CN0MMOnjExb/hU9aMWwR1PP40QTYexF2DtpcTAk6FvLwV+V5ycdChBS92CgOg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ea5f677-1c92-4077-b8b9-08d9b5d1d85f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:25:13.4456 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 5/8] avdevice/lavfi: Make array static const 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: /Oz+mwGi1rLo Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 878bb193af..b208b1a928 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -269,11 +269,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) if (ret < 0) goto end; } else if (type == AVMEDIA_TYPE_AUDIO) { - enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_U8, - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_FLT, - AV_SAMPLE_FMT_DBL, -1 }; + static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, -1 + }; ret = avfilter_graph_create_filter(&sink, abuffersink, inout->name, NULL, From patchwork Thu Dec 2 20:24:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565894iog; Thu, 2 Dec 2021 12:25:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4KMteNjHTQn2vOmpvRl7qc8isVmiHFwxjhiHXpsgybuJB5eoD6aDn/98K74aj9N/vqJyb X-Received: by 2002:a17:906:974a:: with SMTP id o10mr17821434ejy.226.1638476736550; Thu, 02 Dec 2021 12:25:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si1070545edo.230.2021.12.02.12.25.35; Thu, 02 Dec 2021 12:25:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Nbx9LzMu; 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 31D6568AD8B; Thu, 2 Dec 2021 22:25:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (unknown [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F63F68AC6A for ; Thu, 2 Dec 2021 22:25:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EsFtQnGUsFoVWe4H9D/4eZmK+uJ4FnuVHl1NTtFjF9UZsFBRbzLB4wUhCcR4xt9NloVcqYh8XzK18xFUALsN6VAhDHqVjloHZ3fvQwjRyyASmiWg2Dau91MnsuwoUsu30YZYyCNaDBvHX92DEZYWyW5CEOQP9dhEZ/hVg10lPW/TRMIUtbmyEzRQxgA4WKjJiPl2BnL8ytmz7FWMLGMRCB4PFV+28Hlesayn+YBgwWKw382GlgPi4lC48nS2e8GFLyjqcco4LI8EO1NL8TN7uOHaN9zibX1XqbPb617IYgRSuPVWotIevESNr4Ne+eby5sh5HRbRLUvzV2XJplFFnw== 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=RwmjFw4aoFI91bQZoMCIRlSqUOzxhNvtxXLywIbhsIM=; b=L4r5gJhvHZFatnzk8etNp/p2ERx3Uln+ESSnrd7XY7ywIlcLhgra0JbZVeG0yP2VvD34zd/lwII5YCH2v8H7BxWWMUdlDvSKLFYx9mXvK1sl6yOjffWda3WYxJy/HcMq5NpmA3WXhmQItOg56TbniaHvsknOvWMO7Tx8JZcC4ce1O3lfSHf2fGyVzdrJ529HF25ftVu+V/VJ1SpayKqgudCUROwfZqLgvfLxJazotXa+ab//vpr6IjnKJUV0iJzS5S6AkB3cQ8ySjZD+w+yIfCX+HKTjydwqGxJaHq9PiuAKJwA9Zv/Ta1GvJQPkNm4o6UpWFTNIpasTKSvO+v4XHQ== 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=RwmjFw4aoFI91bQZoMCIRlSqUOzxhNvtxXLywIbhsIM=; b=Nbx9LzMu0Eo+O/Ko2IgrKhZF0klLFECsT6KWGLqeTT4DW/V6nKeVAzGeR+tKxaH9tYw0pEZ3fyfej2xLdJudlOj0zUsoE5Alv6X+D9eBlCkXGG8j6FLlAMaJtkL9uaMRdI9Gb/agyg807a6uavWKi2/tIWrryOV7F6ENxlPYYZRKP+rHGxO7KVPubsYkpH31eG2M3wJSc2QoATjToWPbGZGfRHKy/+gN7h8o6off4aLv0SwSa6UL8uVOYTB/vc9tFflSkWRMKzq5xmorjmKaowdgf5VtZYTyHiU4q4ojlXTK4Nwo6xv13ZQ5YgRCkuxkln0A9GCZr9h49UaKWPrlcw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:25:16 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:25:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [btBZPr69+t0zgNuTRIq/zwK92Hhwsjtm] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:25:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4ee32b0-e3aa-491d-7a42-08d9b5d1da33 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/BqMe1JoCYMm8XSop4tLdPAeXAjwf/lct4sXEM345HWoNCHJS4yF2SlbfkN3g2aJegBRk3506BBo3sxK18FGKsBQ+7vZtF7iXgSZPGHXrEPbmyIhMI7WS5RBUKiYQFtJJh4mJ8UdIkvSQ7cI20OJfcwYJuo6sZrrxhO+xWzE7iEx3owtMLpYgvMlPIvFg8/gpK6QQsFgFtqZZ5mbJ8oUHeqFaQtqThKwVqaYDnTUBSdRjuGkxix532AT0XiaBKgZHFnjgeNMYyfMuNy5XxL7Hvy5DM1ruj9BIgAoD0Uy0En1t+LwhIJIGcjUk1ZEAf+EPDz7HK6nXYA94pQH1uvLH4cM1osfb/Wh+ugh6y5rW1ivBvQfeRgkEjT8CI8zn0gzKhzIMLugFFXYauqFO0+yev5/pt2Hz2R3HNYsrwGjJeHcd62JIO39URSJGWoqFmBNjeBMV5vDbamwi09hAsOC3yEjSn+SkwKRUksfocvLxgWWB2+NsQzTf6pZ9v+A6cMD5/GwWhFHF6utlBoFjrYX6fK1xjiJpHiaRYlD8ykp4ZBoLs99MAFzh/5oFeBMTpj2JVAcXsIBfRxz6WItBL4lQm95X8Ve036AoqYuDRvFsIxMxkwsR2T+3E1vnFtKD8CbezlH6Oe6uncd0tW+3K+sJd8UX8WEFWwOBERYTvRQGGWn7jRxwhMldOV5epSWZEaBeNkuXowgQ9Db/4jUTznbE1qdtHnAFJgWrLyCPW3lknmY= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sZmHEpuflxcculz0VBZ9XMeaFYlXx10fSrMqr1GfdTa5iCHPrnVdRhBO8kURI4nLm5JAB/1OBgj/onT3HyHaBZ6i4D2JJs07qmUEDgG4ElNQBsK7iCuqk9DgUabZogeh0ATiArDhY40CQCcuO7Og68MZTuhRqFo6qT46nr82UZ12bf852Q3B8xJfay2tZUJRFRSVNpTrMJs54PyRO97XHHnuxCcxfitQkaTpC5qdbxFRLq6FjXFF3jXTRdXvFpk44dAiO73V+KNbT5J6huEnNy1OkbrcGbjgNRatf4H3hbYlwEaLdTQv0bkdPjYSG0F/Up9RNnnq26NIwBc1MVA5BuS6549O5LSOX6QD0xrbwOghPixnnMBk+tIfKg+9YcAcgPEzQNB+83umTg5on+YPkQmyYrYDe/vjpNanR9Rf7p3mOW8iNDDNXTH/Bht0mQS/KXOOGTqyTzASuStR5HV5QWIe6RovyHoJ7joEuZYGM4ASKVq4rJW5274RAR6HJF4kUeOuN+A0VTU9v+q5N/j9HXPY3BKH4DyInTb2uxn3G0MN9WMziDiQoksODKPbRCaYkhz90dORCB8BkwJz7gN1yg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I6NnWi1XSymE3huYOEnbqfq2GrHcJLBmydvxuzOebiaSakz6VdBYvdwl5KHAO0f4q0qhurjUYW7XA7km6hInr+hQR+iZzHVDR/8stWdsCY41Le4QJ4cGIFkec9e9uQgK7D8Dq5WIshHpRJUCnVliNpE2eWbU6XB3JsQ9A3hIMBaB3wwAvArezj+ueb0+bIn20ldTiArcAamUaLEQlFaL4Sh2C4YnP+9kYRBz33/UQ7GjJtdUxiwP4ULbJwB0qcmhGOkALywRTGoujg5e5K9WObgtWiD+7MJkrFosp9amFwUnGtOYvwp+CVssW6BkdHVsSKu5RgbtS0Vnp1STj7gTi+IBS/Bn5Z3cJLP6IZPR6ea0wS1nzPZTShQnwZVlYc6HBaf3xVNYtNTVRCoZb4Tz1rrjspaVufH/r8147T8ZfdTTBGgwbKqAesahIkn7MJqZeGDUVd+PrgBE9nMKJ4V3+CKwgi/JaKTT3uHcr9YknukwMEDBaS5/cvOUUjM03Ispj4ebQdmeXxVGEhp3FBzHDb7z6Q7C/PA6c9lcU3AKqnzM4bFwsDvbPXr77f2VuRnL7TqUjlFIzyM4DEsa+futQE+wisoCsIkp+1WaJHqwtoeI7wzwzqPtNNqWiVx4T6aE+hH0k15aSccXyy3B1HpUwA4qVevQ2NeUKnBZ0O83jzKkHkQFEotH9fy/xXc6WVZZIA7pvL9LPCaq4mIbtBfiEwUuh3QjfMa3z0PyBel4sNhoN4ybWLLNkPyorEpmYo/BMblyi1B3uZMbUaYJuyZs6tcixup4U7Mf6UNADXDlXuj20CJ3se3XbIHYgFsmBPSUBY4egIcKE1x+YuiF4Bnl0MIaqSJGaAISBzspBCwbL1eVuGqpE9Y1T7SuDywAwp8HePqTvSNTCUHP7Lp9yGjmRx4BByvuBEW60+VvK+HUP7T6WhjExT8n4dSRIecXpFGdGZxaTft9geV4bh7xd5mtPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4ee32b0-e3aa-491d-7a42-08d9b5d1da33 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:25:16.7765 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 6/8] avdevice/lavfi: Simplify setting sample_fmts 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: PBj25CuU5u4z The length of this list is a compile-time constant, so there is no need to calculate it again at runtime. (This also avoids an implicit requirement of -1 == AV_SAMPLE_FMT_NONE.) Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index b208b1a928..d63a6f66b3 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -271,14 +271,15 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) } else if (type == AVMEDIA_TYPE_AUDIO) { static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_U8, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, -1 + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, }; ret = avfilter_graph_create_filter(&sink, abuffersink, inout->name, NULL, NULL, lavfi->graph); if (ret >= 0) - ret = av_opt_set_int_list(sink, "sample_fmts", sample_fmts, AV_SAMPLE_FMT_NONE, AV_OPT_SEARCH_CHILDREN); + ret = av_opt_set_bin(sink, "sample_fmts", (const uint8_t*)sample_fmts, + sizeof(sample_fmts), AV_OPT_SEARCH_CHILDREN); if (ret < 0) goto end; ret = av_opt_set_int(sink, "all_channel_counts", 1, From patchwork Thu Dec 2 20:24: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: 31891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp566168iog; Thu, 2 Dec 2021 12:25:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJymfItldw8Wxafrwj568ohBqO/rr4k4UZP4qLoCX/Du95xOt88AsHrFW+FWsEXLYGWIpSC0 X-Received: by 2002:aa7:db47:: with SMTP id n7mr20554763edt.303.1638476758138; Thu, 02 Dec 2021 12:25: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 k23si1047511edk.555.2021.12.02.12.25.56; Thu, 02 Dec 2021 12:25: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=qMFgFwtf; 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 24D5868AE6F; Thu, 2 Dec 2021 22:25:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (unknown [40.92.67.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C97568AC6A for ; Thu, 2 Dec 2021 22:25:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HREPn8WPCnBMXvTVautJX44Vh+6P4qTdqn1DZY04aM3LT8Wo9/bODAnoBnaLz1eauxCUyv2Qo+LFZD6JLt/P1WC5zJacMCkaBShQQ0s0N4NnstCFqWDsUht/pBU/U25lY126uYIbhU8fc3AGS6Xd0g82WGZFD2VGLhgKPTvXS6iJsKEXA1KL8GpU+Bzxn1KWE0og0xAbNNy0ZfElr7rBr26ZA9BXu5Aj+pC0uduuWtfGdraN4piU+k9sRRn6ve/kcrhTCgH4hBX9U+Ww/62p3m2AcPgUO67dNb2+JmEynIIzCeZhxwS1p77NF/7RrQZVOG/zIUpG+gxNgYfl/wYZdA== 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=Y3n45njR9WbKmqlGn1lYVewaOofiMJPjDqSjmzSD0bQ=; b=E3DNH/LRHEqYnShlRtGTUuhY0BRzfmej/QqpixbPamc7BfLEJvbjg9ppzEnlGKg8fsV7cysPKKuvqfwZ2jR0wNJF4qG24NU18eCbTtmn47Pu+98Q5N+9iDLiJTDPJmK/QL/hgle4JDu1M1NrN55c2EbkEKUKnr9F14fjcrbukkURW4eceUxIZ7xo2qjXb8T3jDT8S2wNtzS0L7vBBFpB44srfhmRdqzhv959P+ThkRAOmd9hkpAuMMhyMqfuR1oDpGm5n3FhUzqMBKPI20SQaP8WwwfxynfcdAfvlXNIGb9SJj36pCV3C9VeFQOu6C0h9v55hDT60NOtN6WG3O+3sQ== 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=Y3n45njR9WbKmqlGn1lYVewaOofiMJPjDqSjmzSD0bQ=; b=qMFgFwtfC7n6hR19V40EQMaBNcsZD1NU8UpZAzQ5/mr+GsAs7TU1MXgvIf22vi1CON7+/mXWdnluMR7K22A1of3JQtgYJYGq7bWEfsokVW/P0xfUoDeczpPAoiiv0lsYKxfoiYudB37YZUK7jLMvUGQ5ODpmPrWbFbYN5004W2JalvMIAs4GU5pTZCGQKBm46fS9K00BNHgRt8AeTjfRepfdNr1PLnrTxhxj2ZulTZhYYBbQ9q1hbajExVeWo8oYExF5r528yOwI8i6DwebGSxXVi1YHpGl0ZAo6ZOdCS5+9G2A/cmOGaWQXJRcrT08RJMOxWxk7V8s4A6dvlFhUWw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:25:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:25:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [KEi68xE99xZjnmPLsf635uAx5YsrMK8D] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:25:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0dfa124-715d-467d-6cef-08d9b5d1dbf1 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXnrnTKVombr+C3O2oFgv8baoJw+J/75geKDljqFrRhmKQTbdK9FUY4GfR2MccT1dwXouRVBZmzO/pSUBCdVA8AvUPozqCbwD+bpFwsAdRdiE/9GbeA/cGqtZKe1luaHSsDqq5Gkn33vww9lbXt5Xjxnn+Utk06wAIPw656mvMfz1u5G7ApM95EWVrTCsLyyeq1U6hrnOnJyc1yqMgtRDwL/2V9JO2wcJi0eNm13SlZ6lCoc9RPPdBRN829tIPHuT/IjJolbwe6edm9i/trVmKTj89xHcXF/JRpwOzJ0w9gnNescmXqNHXFiXmouddMC8ntXHA1yKCt9J7nvftnAeabsIS9vjCaSmfl2AvYq0Sga78r3ljBYHlmNbWWeijutqHTR4zCbbydLATThoya9rnq/ZEaofayzNx+hE5XzG4thrCr7NljHp9dTymEkRKdy7x+2hJAmd/TfzTpKsTWHqwUxTzuYdTV32H/MLHEKeN4qRyBbtoAktoXqr7nB2ZWRCujyRdZPXCbrmTZOMMY09G02XtxQm82rWnZlvERvwi2hZvnBzoZmsOY4rEz2E4j/GHdo4q5DDlJ+0ZEq29Veysfx90nb+lhLmqMxKzSXmFPFq+Nqawmn5D9AOIb1s2gR14aTLzoZ+31i21pTi4vj+1T58eBXU4gLecXgPyDtyGy0KXMQmM9TUnir8sPqta8ChTZj0xRudYvOESFfrCHLiZgQhjItuzxNJI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZgZSrmzu6EtAx9LxGpwLXZn+aXscRo3e0gUzRycPhJhOUqiLrEBPQU5hAS4bcoEfKanuO4Nc+qtdSf+EMBNlBBjG9YkveoPmhcNDv9iWA/Y9E7Y10eZFzP7neYWvFAQV+FJUYRELsAAGRv8ryl8ST+kmKANAIIRaf+NA5iaOYHA+Tvv17R5ybQPSNoWU8YB8gxUJn7lHb8bLBlFJm1UBjRIRtkUMY0Dkv09BtWee+BYNpx4sGcgRMhwqRR77+a1u13rYqE7Xi9N4nlWfXfI4FnJKWhU3ww1T92wgMWPRljJ7z5gxHZyIRVbR86LVVz7LASNhBvW/qOMlKkoymQzq4Y3Qv4VyB3nkEM89VG+LNRCxmeddR39LDXZjBAUqtHi8j73SonsOeJlJ19BcS0S7bFW5esuwQb+zyxw0YlVKLnxR5J/x3GFUczk7cik9mHNiSNOdTp8Ov9ZxiuX6wzvn3ri6JqTRgyS5V+BzuhkyePKQv7+tYSGmmd0Q5hhyhSQ+LPrY3L349hHEeRWHw25Kqd86PtSyMuMrd8LzGvJPwSjo075xpNjpJjijgWkwBq6iqAWQ4FVPDHlBloIODwZpyQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RsddTwxJ0XdMn5EIgoCfm7sToH6kJsShjk4KcHbg5m8I9Her8oT8LLyv52b67WjEhLMH5u+PmmwQ9nGdBqGPSg69vHekBLKGmUMKge8oIAMuY9+1zInznvJokKKwx4giP7dMj/WDifHGkT5osX/ynhBVG58gt23+BsaLsjVdum72u/Dy+9bodojJCEyV0YFiNw8vIm0zuYnKUe9x1n0bG5iIkW3fvOUxGfuBhqHP+H9wtpmtPrtPnf0HWDJplP8qDMyR7rCcyUX90StIkyQ0/bi/EHFZOQHtslpnZVYWsaekW2PEBUZTpwNm90a+pYYKo2TrEbVFJzjGqVrnnHzp4YNQ/vaCByGY/wUNeKMsRxwBg6ltizhTISsa4MAs2GtlaNACOuJbFvmzgPc+0pEBDaekdRTwQ4fusxPjQqBSY4rbPmQ6/gMiQSxoCb/PGGuSMXHW9H2ra1W3/MUKx7xvQerTr57+CGkcL2zF6L3bnk9i62DHyqlIO78EzmyBjTZSTDqm6geT8cfckOHmzSlKmRSibX6ao6ElY/aOGeoqZ7BKJSZQ0Nz93wdIFqVIWIWdTVKRImICq9LIEN8XpP4+XCu5S2AbHzz8hb5+EJ8dagkXdTytxt4PTjCkiAb+9CZyVNxEVdCDzYQIb69gL6USJ9PKkMkWO/tLBG22uPRp1sPOr2bCteX3VTxfbxos7pxEzUTycXDNkURcrPbk1K38v8VlJBHBhUl/j5LCSwcvThBN9KJHQG52pcE540E+Ba9bkW7b6ebrc6L9QtFj+zQA5UGWT3Qk0/tdUYN29H+n2NtL7wLfYCPuemMQmVNJywCgo9GyFEquALIwpXclPhV/T/DaVzg5qof393mgd1uT/mTo4rZMHZa8KvgGeeYfrBNTIrMAjESEp/JOs7rCbDl35TaDYUeqBe1ULciyiFMW1chZiQB0XHB0Q+ItCJzpoSlk62VXtLcdUgFl5axtv8zLbw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0dfa124-715d-467d-6cef-08d9b5d1dbf1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:25:19.4502 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 8/8] avfilter/buffersink: Remove outdated comments 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: bm0tAS+Ryl2f These lists have size fields since e48ded8551172b58a78f30303a81dfce125344e0. Signed-off-by: Andreas Rheinhardt --- libavfilter/buffersink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index b8ddafec35..c0215669e7 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -43,18 +43,18 @@ typedef struct BufferSinkContext { unsigned warning_limit; /* only used for video */ - enum AVPixelFormat *pixel_fmts; ///< list of accepted pixel formats, must be terminated with -1 + enum AVPixelFormat *pixel_fmts; ///< list of accepted pixel formats int pixel_fmts_size; /* only used for audio */ - enum AVSampleFormat *sample_fmts; ///< list of accepted sample formats, terminated by AV_SAMPLE_FMT_NONE + enum AVSampleFormat *sample_fmts; ///< list of accepted sample formats int sample_fmts_size; - int64_t *channel_layouts; ///< list of accepted channel layouts, terminated by -1 + int64_t *channel_layouts; ///< list of accepted channel layouts int channel_layouts_size; - int *channel_counts; ///< list of accepted channel counts, terminated by -1 + int *channel_counts; ///< list of accepted channel counts int channel_counts_size; int all_channel_counts; - int *sample_rates; ///< list of accepted sample rates, terminated by -1 + int *sample_rates; ///< list of accepted sample rates int sample_rates_size; AVFrame *peeked_frame;