From patchwork Sat Aug 20 10:23:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 37369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp270085pzh; Sat, 20 Aug 2022 03:23:23 -0700 (PDT) X-Google-Smtp-Source: AA6agR4MMveLtNXXp6o3lTMPCuqmHPc2SS2rf51FHV3XzGTF8Zy7t3aRH6f/T+jF38Mg3VIj2Chm X-Received: by 2002:a17:906:4fc3:b0:72e:eab4:d9d7 with SMTP id i3-20020a1709064fc300b0072eeab4d9d7mr7168166ejw.599.1660991003136; Sat, 20 Aug 2022 03:23:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660991003; cv=none; d=google.com; s=arc-20160816; b=MJED45F43W7D+9i56JKN3Ld2rGu9cS4cOxXy8hDMnxNpFxImP1txjshf2m8BStKtWq eONwZZNQ6aQRFka05TGV5H9lY6DFTYFysP1zcoty9RTGzcLVoHX6hBiIzCp9lw+WluTL Uc/2iXSKq1RRTMgE0NqTwkWLhrXPxKTewuCQHPalqPq+U4atd8hn0dGjlp42mU13z7Y6 CHRR+sNWVJUQtlqG2Wicid3LBsWTdD8mYGUjCp+VOVxUxRsaqAYS907yKhcZov6bhkSj KCz6uNH7TJNP0okdp8PjuHkydMBLHsTHAnkZyB4tEe3Wz/nhf1dgXkS3/9h2cHW0z78C 3TWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:content-language:accept-language :message-id:date:thread-index:thread-topic:to:from:delivered-to; bh=dYFVxVJBU19fMMCnp93SBrhiQoR2rJPQbfOojNaCR8c=; b=ZIdV3SlPaBH1jNvsrws4gNo8HgLHir1OECmA2in1gFt6isps6mKbVQCC9JQiXw53qs ca7HYaBiiRHDd9ei13nZZbZ4IUYFUzKJckXKPsh4hSHDGmPWFUujllS+tzatUZXOlPeb +Jw1gE+JGbhab0IT1tvAs1g/k2HJkz1je8BXy7o5OVXlWe3pIzZr7yCS2eCZDf4bgpUs nr/bvRp00eOqkT5yx7dnu7uXBIbO/9phEXP1dF8nTrgchj7afWZtKtt0Bm12sNpsLUId /uXiF+OLeBnjXFI0o09JGJKh7qkIfLDBQAjGAgn8gvdXALRvKHf+b7c/HA/MsKMjdTEI NREQ== ARC-Authentication-Results: i=1; mx.google.com; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g14-20020a1709065d0e00b007121b9fc6fbsi5622387ejt.956.2022.08.20.03.23.22; Sat, 20 Aug 2022 03:23:23 -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; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8B0F68B97D; Sat, 20 Aug 2022 13:23:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17E0D68B82E for ; Sat, 20 Aug 2022 13:23:11 +0300 (EEST) Received: from kwepemi100014.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4M8vmY1M2GzGpXs for ; Sat, 20 Aug 2022 18:21:33 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemi100014.china.huawei.com (7.221.188.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 20 Aug 2022 18:23:08 +0800 Received: from kwepemi500014.china.huawei.com ([7.221.188.232]) by kwepemi500014.china.huawei.com ([7.221.188.232]) with mapi id 15.01.2375.024; Sat, 20 Aug 2022 18:23:08 +0800 From: "Wujian(Chin)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avformat/wavdec: fix the ID3 metadata obtained in WAV format's missing Thread-Index: Adir5/SfvxDRjRCoS3uN3CnegRVH+AEsn/xgAPkVL6A= Date: Sat, 20 Aug 2022 10:23:08 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.136.102.143] MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [FFmpeg-devel] =?eucgb2312_cn?b?tPC4tDogW1BBVENIXSBhdmZvcm1hdC93YXZkZWM6?= =?eucgb2312_cn?b?IGZpeCB0aGUgSUQzIG1ldGFkYXRhIG9idGFpbmVkIGluIFdBViBmb3JtYXQncyBt?= =?eucgb2312_cn?b?aXNzaW5n?= 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TPRBwSLXkg94 Please review it! Thx! -----邮件原件----- 发件人: Wujian(Chin) 发送时间: 2022年8月15日 19:32 收件人: 'ffmpeg-devel@ffmpeg.org' 主题: 答复: [PATCH] avformat/wavdec: fix the ID3 metadata obtained in WAV format's missing Please review it! Thx! -----邮件原件----- 发件人: Wujian(Chin) 发送时间: 2022年8月9日 20:03 收件人: 'ffmpeg-devel@ffmpeg.org' 主题: [PATCH] avformat/wavdec: fix the ID3 metadata obtained in WAV format's missing Fixes ticket #9848. Signed-off-by: wujian_nanjing --- libavformat/wavdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index ca61b84..e3f790f 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -555,7 +555,7 @@ static int wav_read_header(AVFormatContext *s) case MKTAG('I', 'D', '3', ' '): case MKTAG('i', 'd', '3', ' '): { ID3v2ExtraMeta *id3v2_extra_meta; - ff_id3v2_read_dict(pb, &ffformatcontext(s)->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, + 0); if (id3v2_extra_meta) { ff_id3v2_parse_apic(s, id3v2_extra_meta); ff_id3v2_parse_chapters(s, id3v2_extra_meta);