From patchwork Mon Aug 15 11:32:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 37281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1217380pzi; Mon, 15 Aug 2022 04:32:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR7paemWhjlUqnW2KuH26mBVl03uik7lm32pcxjMVTzoFA38j79wDok00jJKphwOLEguV6Dl X-Received: by 2002:a17:907:1361:b0:730:8f59:6434 with SMTP id yo1-20020a170907136100b007308f596434mr10350414ejb.745.1660563147985; Mon, 15 Aug 2022 04:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660563147; cv=none; d=google.com; s=arc-20160816; b=iF4Ja7P0eBSwIpOx0AtIDNmKGB78F+FhJ+0xukDkgZlYMCjBtEjHtzBGn9zj457CWp eUjFwHnJ6qO5VA29Ep4QGVbuVb0XfdFMxX3i77q7uN+OsMh46FCMkYsRRf5nStRQoS2s RMQMsxDXMTbonf332b4EbBcbfJEu37UR3JS0vK1YRGZlAkMkRb90uzsW1HycRUDtx30O +maMSEQQyK5exHDHDEeehTEWy4WQQ5MpP4TPJdwswBlS+N6fevzQs//dK7NLcfV1Bww+ MIEDNUI/MFKI8R0JBZHTozst9SQ3QNHqBriMnrte/gWQDgCNXdH5NfOFmh9GVwsHaUDg OG8A== 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=AZLMvhzQb7xk0fog4bDwSZEKkSm1Z8WLqup5LGGVy9c=; b=a+1tbMNGHiYyQbMA8p6MFx9h6lCXd91lhjBB4uxmtdWFPSXuVDSZLnro4EnIOrt8dY 1QlrLl+3rqhD0jztNOvJ1tj8wKjkYZrXmDE6UU15a484oXaYydVcBkZW2zwdeAQaEtSz ea3K5oN4Dj6emMJ6ys0Qt2q/THje2TGuK3jsePglh5aiayrqnR97p1DB+Jy7rzXPC0ve q1WSRE43xbhY6M7ir0JZDI956usgzrYt9eKx0sMKzLDu+hScmVG6/fGGrPT4h7al3KqF WYGwxmLiJtiXxRMGpYQklhd7p+TQcvWwW3ybSs9qY4PAuQW2HkTnkDinSW0zfORfBXjS 6D3Q== 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 hp26-20020a1709073e1a00b0072ab4b5ffe5si8995297ejc.987.2022.08.15.04.32.26; Mon, 15 Aug 2022 04:32:27 -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 4087C68B93E; Mon, 15 Aug 2022 14:32:22 +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 BB9B168B734 for ; Mon, 15 Aug 2022 14:32:15 +0300 (EEST) Received: from kwepemi100014.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4M5sWt3mhGzmVkH for ; Mon, 15 Aug 2022 19:30:02 +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; Mon, 15 Aug 2022 19:32:12 +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, 15 Aug 2022 19:32:12 +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/xg Date: Mon, 15 Aug 2022 11:32:11 +0000 Message-ID: <6488cd9cc9b2419b9e259fe4f5ff0c9e@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] =?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: GXCm8mbzeevM 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);