From patchwork Thu Sep 9 15:57: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: 30090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp648554iov; Thu, 9 Sep 2021 08:58:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyONalYD6WCRkzyhWKBqFHezXZRFjJZ9gHu2ofNIFRJHIUo6gtwOKjqwnVNrqhuKOZLlvJ7 X-Received: by 2002:a05:6402:4247:: with SMTP id g7mr3888661edb.245.1631203099941; Thu, 09 Sep 2021 08:58:19 -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 b1si2433765edr.458.2021.09.09.08.58.19; Thu, 09 Sep 2021 08:58:19 -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=ljjML4aJ; 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 7EFE768A996; Thu, 9 Sep 2021 18:58:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7664A68A996 for ; Thu, 9 Sep 2021 18:58:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ieqRRhOwsRnPkAruJkJiQ5RXPejQVox5DSO0dHDJnAIvaF50/FOVp1QlMEcD+PqHr6v5ReAqnGZWmgQeizPef8Jiq+vwIUo57WXXUBGUlQK313TeerDyel5nplPHRyR0LTS655TqVAk3W7VqQqsKX5sf9v5Wuomj24KxL+AsWwSs42SJr2E2OxhTy4erMl9Q5IEnnfXax8YEv+ghA71GazPlvwgg9Uou7a346OWySGvQlOzHe3guaqakXYAo8ZVz7My8WWXe5NLmHqqVN0qB6GIxXBUd0b8ExS6mIIpuXKV+6/YBME6Ip8Sd54QntV53UNHR5/MzE6K6IW0ZcxAAvQ== 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=iFfgvoW+SuZWvuiOezPQAImCtxWoYO/FCVnzk8Xd7e4=; b=S3WIUmiftU/yRbPNQXlNVdAZGKpZ3kZF17v8Hq79wsXXeKqlUWTBRRrpW2VGiMW5cmq+qO97aNLoCBGocG/xSnajBrU9x5nFBtaPAQGGCVPe5OcVPfHyCm3wKVnCOJAnYX2nFnh9RPc59rRAo2z7lrYhBFodys0PfpPt+c3P+dg053cQ7gPSVY2gtcimSyEO93DNgz5TIakB2QhfgGlZcnATRXPtbqC+8UwfGUb2muz+bPPkQpOUuwUUTPCuGrB5+rAgfC1g5JhaW1anV5xVp8IBtAjpKUNgLS3flCzyE/Ls51ADaUlf5UY93Pwm3MrU7U6hHzwhA7hX/unn8v3D7g== 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=iFfgvoW+SuZWvuiOezPQAImCtxWoYO/FCVnzk8Xd7e4=; b=ljjML4aJJzfR47qtW+b49ng2YZf3DaZr/bnE+C2qknMGiUazbTtxmbYsBfQ2v2aTYlRlapxYhBhSuUEmVL4W/PAe678ZLtqKQ63dO7LZW80uaobUxPjdedE4MmJcJ7+9kDt4WGUdJM5sOgkUbmXAxhkO+PbKzaPwoUUWGjvlTANChiMaSePHO8vPSCSwScvvH4gfr392XP7luDjCTmMWNvIzBqCrgHt2pWBIMm7tt5/RojHfz5Ddtlxq6Dyb7YYKZaLr/sQuHMoCMADTMYpPa1lwsVdaNDAvBSypLEIZqoPhpGxXwXsyIZLfpMxNgNMEt4jRL08HiI7Lmwh6LJRniQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6863.eurprd03.prod.outlook.com (2603:10a6:102:e4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Thu, 9 Sep 2021 15:58:08 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4478.025; Thu, 9 Sep 2021 15:58:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Sep 2021 17:57:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [g8pe1QAIOKLc1hD+gbxjyUhnLjItpXy8] X-ClientProxiedBy: AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210909155747.1841422-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR10CA0036.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Thu, 9 Sep 2021 15:58:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73c28769-7f44-4bb0-6e60-08d973aa9de4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXImq1sWRAABPXhZ8q25ZjYdgCAY6eAxKwuvX/7vMmFcWnp7g5AglVVxD9dpnNqiR/0Fm7HgqdTICT+ezCpmLTyAqQFIBwHmpbwxQ0ZFXrPfVH7TljS0D9DOupBIEaNAca8O45s9+tJX0UD1OIvglIRwr7Njm3yOXY2p6siIRhVhtttCwSC+mMrFJf3ZP1iqL/jpU5Xf3rUXa70YKkrW/YFAqKt4hd0imloCXmlvwQIGSFK1OxMpNe2HaiWfQdoI3EB9J8pSkYdNDwr3Sr/a8AE/27SqVKpeh64/V7HqbEXCaR46LMRBAFCcf41SNtzgU+nLwohG4/nnAWZ4ryiw8MFjI0dg5IY2RI06Hq9xemrEA5jdRdyO/t4t5ZdGRzo/CNhBFQ7IAp4Xg0J0i10jH83lubTVJmnhLjO4kCiNt5jadFUN6RaEIqaa0hg/XN7tFZmYs6v75n0ybqUawipwqBElmWjtLGft6dOUvGNlMRIgTYF+o1cQAdULEfCJBEcIqknkPA2jq/PAb1wMF6t5lkQJFNmZycZ3Rl5S8471mJLJbxZ5WryDZjyYG6jYk9EJbOjdVMRnhzcm7DDBACK5XPzSfGPuuli9hl+kWBomnkbnEhYNk5b+W4TPdD3Z5R6lzRPDLFkCeGl8Z+BaC1PtD+8djQ8+ceDhe5MhY1+5bDu6bu7WsyGwBFBm3ebkx2UuoiVPZIM0AT2S0xqgi1/QTPKKTcEB7VSKUw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6863: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJeJ6OkEcWYjI/PNVwxznAi83xpNPcjwvA2kqQieB6mJXPb2MwZ5TL+aVTrnjxIn6IgGVN/UBoQlgCGPX9a2dG/KSfG3RGhwxbFz8P50440ZnVn0ye1KAvRL1ILFz99bOLKyi3u70LzIw+J1TftxyU8Yx0MMWWYoZ5tCIJoTxxy5k1ApPDEP/D2wLhvokDz7nhIdKTmDXGnPofCNfQNem6Hy0E9Tn+Ki5aqMWcYfG3oX0uMx3yc1OxEFvZmvavo5LXaUzWGo+QR2atzzrsYPyXDm3jHI4Ukq5K+gDgxr6jTMXQYUaub0n1jiMRSXAtlOtgGTPfIcwhh0VLpgvHqoO+YbnFzsCalaWvN6Bd379slEalTUdCweAv/METl5H77fxSOp+BONwrFTGwXf1pVKY1sQIqqqpoecqYaV8jmmsbamIFIpixcOjQ0WVpd6W0vE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Tr8V2P4PLhR4ch31fJ++5yAnr4g+ewGSKbrrybumuF/9so12x324EbyTpfHcWQfzQs7eoyjkb8fEsKipYri3P95AHKTurmMdbQXUeUHd5aJ36fay+xRsl+pUIuIRT5/hffe3J9dZUKiQJmEUB8ImfA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73c28769-7f44-4bb0-6e60-08d973aa9de4 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2021 15:58:08.2493 (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: PA4PR03MB6863 Subject: [FFmpeg-devel] [PATCH 03/14] avformat/mp3dec: Simplify checking for no-metadata 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: U7p0WbUidIMf Signed-off-by: Andreas Rheinhardt --- If it were documented that a non-NULL AVDictionary is always nonempty this could be simplified. But I don't know whether we want to document that. libavformat/mp3dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 9205abebc4..72c049edaf 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -384,7 +384,7 @@ static int mp3_read_header(AVFormatContext *s) ffiocontext(s->pb)->maxsize = -1; off = avio_tell(s->pb); - if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) + if (!av_dict_count(s->metadata)) ff_id3v1_read(s); if (s->pb->seekable & AVIO_SEEKABLE_NORMAL)