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);