From patchwork Mon Aug 22 13:59:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 37385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1310488pzh; Mon, 22 Aug 2022 07:00:02 -0700 (PDT) X-Google-Smtp-Source: AA6agR6wX6dO8bV36gU8W+oXaASm3qL9JTa+8Fr8NsUUm8vgbr4HX8AnBhUMWEIkXVZvJ+JOlghw X-Received: by 2002:a17:907:3d94:b0:731:744f:63ab with SMTP id he20-20020a1709073d9400b00731744f63abmr12648623ejc.541.1661176801760; Mon, 22 Aug 2022 07:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661176801; cv=none; d=google.com; s=arc-20160816; b=kgh2/Um2VtcoTQpWVp6VtLd0mrnwepuzsUwqn+v3J1vcCsWimuqO4YSIYda4t6+uyD +DP2AlgSP8QwYR82BNok7Svu+GkTDKlWEnauWDFWuN+igVJ1DAoncXpE9koccKdvo5I2 H8u2h8XOePDzrwORL54HSlFSXWysgxVuY8DUSzcq3dgc5tAEuF2ZmASyCBgljs78ql06 0k3woV/ceZBlMHgRq3QvWzMqb9Wv9lvpHvY7RSMSujTPmqYgHhPWMfGo58jsFFz4MRJO t6GZwVJ7wPCYi5sFFeHGJFukp/GmuLlRimJ9ncmnC+gKIGQpYSjCe9lrd6MMPnnhz7if flnw== 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=OarO02uz005g9ur7L0luYFRK66L2Gi4EfYL7d8V1iTA=; b=bIKgJh0emYFLW6dKnryXBosME/RKiKU52rs+X8y6QwoXFXtYQEXCgt7aipEcIyQdvE MSTXmNtAZ3cTIW4gr5h0GulaSB+BINGQ0VXtaLEbt+JKsRfiO4DciHHwZTTWim9FJiyC DtR3h369co5ScNCw7lSc8FGfkipei6idVq/ACVkabR25sXH2lx0v4GH/xkDzcG1fxy2b y/OzF/yuIskFPGfd7usBzSEjVET99GXke1wp3Yk8jknEOxD2D30OHWzYbUfipNB2LmlU kTBG5eMypbADsVHCLFJmjfVlqTVpH39s64WC+s3ISu7RMKpBnbypdsmqCIOfftSvruSI j2Pg== 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 n25-20020a056402061900b00445f2dfacaasi8700787edv.614.2022.08.22.06.59.58; Mon, 22 Aug 2022 07:00:01 -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 F0F6C68B9B1; Mon, 22 Aug 2022 16:59:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC20F68B82E for ; Mon, 22 Aug 2022 16:59:48 +0300 (EEST) Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MBDSm29SlznTYf for ; Mon, 22 Aug 2022 21:57:28 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by dggpeml500025.china.huawei.com (7.185.36.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 22 Aug 2022 21:59:45 +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; Mon, 22 Aug 2022 21:59:45 +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: Adi2L216d74wqvJnRLGU8oVAuDTO4Q== Date: Mon, 22 Aug 2022 13:59:45 +0000 Message-ID: <2353fb95968f447f88e22aaa17025b38@huawei.com> 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] [PATCH] avformat/wavdec: fix the ID3 metadata obtained in WAV format's missing 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: hNlLjrHdoUSn Fixes ticket #9848. Signed-off-by: wujian_nanjing --- libavformat/wavdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);