From patchwork Thu Sep 9 15:57:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp649647iov; Thu, 9 Sep 2021 08:59:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrqR73ChCUlkadKrJn0tOEgT5/s3Mg5hTcFNde5nXmtRnrmZrwO1W42wzXBcjCZVlH687v X-Received: by 2002:a17:906:a399:: with SMTP id k25mr4120686ejz.514.1631203180307; Thu, 09 Sep 2021 08:59:40 -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 t1si2340378edw.582.2021.09.09.08.59.39; Thu, 09 Sep 2021 08:59:40 -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=l1Oe3E+M; 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 1A84268AA2B; Thu, 9 Sep 2021 18:58:31 +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 9B96868A9C4 for ; Thu, 9 Sep 2021 18:58:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kmz/eAtWN1qrfpjC97xv7a0EyLXmR0Y+JP98yykFVSRpLzqOY06uP4t5kRHdSrDvxves7HwSERSFnWh/zn6SUgOWnyHQsr0f03IAbgMGJELdbjkb19RpY7o5RSQ8T//FCkg92/u7rDUlj29HOm1nIGqSatxWtgSqcgrDvrmXifaFuADvmojmPAsFKpqcaTAdqgJ/bFS8rtodUUQPmIgg++imOl+h5/7WYdRSgAlctMUVFwNHF1KeKUtgEV0EjSDpFD6nykCtfALL7/uRuzkqgsCCNnLAVvPgFuyI6lcQLFcKbTRuRQlT8UC9vFarQszYQuOEfmyHSeSVNzVmP5xkeg== 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=STCJ3oNZ+WpQfB4726a0mPQNHuCMn6uYIxPamZpC8iA=; b=NGRDTj5ElfILKoPuW8utePpyH8KTF2wIQEkutnmlQoGYdE3XXQU4UhK0CphfRrh5hWZgseLK4tOnaJqM3zn0UWnaXLjXb/h/kE+hFz6LZioR1g6slIbLPKqrUMIm37tTNHow39rkOatFQ5Zq73GcOQWDLu82y6SCOPQ6tBBSxQbZjiakrBIocrgMeaZijhHnP8fL90AoeOtAmLtJB8iiG0WU/Hn4VhQ5yXXrZLk3WXpuiPSCMsuSAQnpNfbFZWkq8BZI/KvV8VnOB2NUtKf9nKj1R4T5kxhwt22+VZuaRiCfUidhnQnyReQeWZAhHdvGzJn2GaTu99mnT4ARfAhKmQ== 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=STCJ3oNZ+WpQfB4726a0mPQNHuCMn6uYIxPamZpC8iA=; b=l1Oe3E+Ma7N08iDt13MuStcB/cHx5ZAeMpCRio7m7RHYG3jlJZUWmBgWdogzc/S2U0MxUffNFlj9AKVECr5VZbXT7nJBnYXcxJxt9+JPjZAolQvVBo4jaPmOX4qY1KNzP4ltJXqUhBlC28/nw69om8Y6YBnElxtCOHRbQVncYH1qgI6nqHWBcwj3EDIFfIaRcp8Zf2zZ7h0BKyfrSTA9ZfF9YJjfcZIcIq7+NtN1kpOmhOkc29jWnc7G/S4pzsvmM/q+5GaU/i5/Ma4mo0HfLD6z7zYo2M6jlC4D9fEF6r1+XqKv+sER042EXm/UbyUDqWz3Pi5pjki/24zqdpaqHA== 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:20 +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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Sep 2021 17:57:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Bx3w8EQvGEziFeg6S5MUIYE8fhNQnAe5] 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-11-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:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5bcbe4b-5073-4dd1-64bf-08d973aaa540 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQjHo/KsCc3LoxlbG+9PiyINimxZ/kQua79NS5nW6fNQVWhyKIT9y9IGxXol21HSCw5PBEULalt10aHVy7wm4XhH8ZnY+4h/MbhUI2rpVBSwHHFz89bBckGLHtBvoRlDCRyPR6m+G55w9wJVwL1qqoNrW1Ko4TD+WiFmr9rAPQKqo20lRr1iQknREFQfd3guZ71gaqMp61ggfTmBMtZ4uDWXkoDLAn0XofTjuYKNuTS7l/XTWlvqra2ljRsn70u7/yfJIx+VQQ8J7tvt1YFSfE+YMzQyaUFswtKYn/Liu6GCPtobBFW5LkcU78WfZwPLjMJrI8FBZq6A99ZWsdetoQuSHqMVTfbYRzfeooiFNEWlz/k84YWpOFA6yzWEIdromew3PvavNgIuMeX9wTv/4QIAp/1+EZIPq60Qq1awBJvB2KLHmZ5mj7K3Cq32iSJ43U4zatZBoOFodbjyNAEaWTl7OuVg+aFLERxrrYmH7LVHVqP8MPVrqO4QF90spcljXE1rIAG1eOvLrEq7fi4NJEu7FbhWuJu81Os++rEOhjmIVxpyZxISjVJ9tsMxe5xKzCAV5XuJ4tuM38rjcBgZJQ4u5KryZwZ8z0QjVxnr2jRaG2dB07FHbUEBXXRrweJBL5YILlCtOI1S6SuEcWBvbcSdEgM7EVcHxiVddTiEnchRc9hq6cEPP8cgXxrRzwOWOQBKakK2EBdltOnLQVqlQ/v2IaiZIhZWT2uagDheCGaORLlWJgRLIDkv6acC352Pso= X-MS-TrafficTypeDiagnostic: PA4PR03MB6863: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0t4S8OZJSNhxlbUikbF6ITNyh1dydMxj2NJlwaDJ55n28EFZ8riPZ5RW6R/+wb+6NV+Pi+NTB051RkFblyUpZPyI6MAspmdPDjp3SONh2nRsuWw7YjtU64+MJpzPtVNkIHnMadWfvISjJOvOpxnhCL++wItq41znPsX1dd6STUPmW+uI7NWMky+xKBOjnKKs/fhstK5IyPH9viqiJWlaW9/K7Afq8nHHUldRHzjPYg9UnI1hWOjpqnh390PCIcinGDWxInRfUpfpLcqrUrk5l20iYcW6T9u6l5vD5dC7A5yhAl0kRE0pWVyf33WltyQEtgqDWpflaSJYojkxvM2ehr/YVZsq3e384tEdJNKFER2AZ4DQMYueh9mXwjiylAahVkkVh9HNDNbVyPVspRIgM84QqZQS5/d4RmBgdStMiZizkypugJpYgOa1l+sUsJKZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d3vmoKgQv8408CGwBIMA+/AFxOcZbURNCuSbJsN7TpwvNRlM1LBJbJ2EHqafm4reAjp8Lzrem/bh3g2H27MDS4KKlV0h8lU3zXxpf5gJ5FABQEHTHZZ+gfdMu+AgmNXZgJMPLu6qmPtmF3KLthtEnw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5bcbe4b-5073-4dd1-64bf-08d973aaa540 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:20.6090 (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 12/14] avformat/demux: Don't free inexistent ID3v2 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: 5SZCbIiU3uR1 Signed-off-by: Andreas Rheinhardt --- libavformat/demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 267ebce07f..7bcd23ed62 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -319,8 +319,8 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, goto close; } else av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n"); + ff_id3v2_free_extra_meta(&id3v2_extra_meta); } - ff_id3v2_free_extra_meta(&id3v2_extra_meta); if ((ret = avformat_queue_attached_pictures(s)) < 0) goto close;