From patchwork Wed Jan 4 11:37:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Zsolt_Vad=C3=A1sz?= X-Patchwork-Id: 39863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8742883pzb; Wed, 4 Jan 2023 03:38:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXtOdXd0Vc/JIQ5ynURPUIxwbKF52SZxFdF1cLQOE/0E8/iSzfpG0jcoE6XpnIOxn7P0PGVA X-Received: by 2002:a05:6402:33a:b0:46b:b750:3d2e with SMTP id q26-20020a056402033a00b0046bb7503d2emr40015133edw.26.1672832287649; Wed, 04 Jan 2023 03:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672832287; cv=none; d=google.com; s=arc-20160816; b=xLcEIf/8FqBAcGiN5tV0Kov0GIe+pckGaTskKJaFDYORqJSSR3J+t+rsWVknbjxQvg BDh3B7S6nZvAILUdX2W4R7MpvUN98GcOONiZ0ippNgWi07NBRuE3zfFYGVHP+/4UQjlA j9EV5nfigSJt6EPLfUOSno5sCr+1biQdlhQfnadywWYl5Ow5wy/bTut6v6JdsQjiu3M3 ylpI/kxw7z+WkQSQ/Xov3HEosoBzqWJYDgnSWgBdzvF3V1seFpCE2w19haeDRVvZIUx6 O19tWLo82g8jKm9Jz/e7mpSm5B1ISetL+0AMaC7HpkKgymOcZ4yjEuJeQokeOtCUsEXA Fp7w== 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:feedback-id:message-id:from:to :dkim-signature:date:delivered-to; bh=2o3NwCAu8eimU6S/0er6R5Bos2CB1gkLOuswhSYzL4c=; b=KcO/1GJF3p7qtfKJOxkSH5lxn3MOvE+iDtgTXYBStnXRwx99Vj1OXGgXsQKq22rvIk 1l+MxaKDt7FibSFWa5s/gN6aT5NUP8QybvH46KDhR6Gp2JPytGZpjeFN3fA8oWz93dsW 6KilC5E+OMoK9yMJG95rFqgQ/eegR1GgcpFOGsZg2FVnj0N2a6UGmdddJBRB6GVkY+7k 2hxU6Vj5eoe8ja6Ahzqkv1IpwZ7kD8LpAZrayjcPjuqWi17n214/Owgr3LTobAJTwJKC uQCPCRM/epd+Skaga/pwK/UJYKtAvItAfFwhO4IdTznUJCJy6KM1b3o/XjnzhV9gHOkF N8pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@protonmail.com header.s=protonmail3 header.b=nwBT634q; 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=protonmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g21-20020aa7d1d5000000b00489cfdb858bsi14664245edp.430.2023.01.04.03.38.07; Wed, 04 Jan 2023 03:38:07 -0800 (PST) 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=@protonmail.com header.s=protonmail3 header.b=nwBT634q; 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=protonmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 361BA68BBF3; Wed, 4 Jan 2023 13:38:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-4324.protonmail.ch (mail-4324.protonmail.ch [185.70.43.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C1B468B6B0 for ; Wed, 4 Jan 2023 13:37:57 +0200 (EET) Date: Wed, 04 Jan 2023 11:37:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1672832276; x=1673091476; bh=TP1Uziz9nuYCxoVb8fDdwDmv0R8vCAOXeQFPrsIanCg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=nwBT634qNonSW890pYWyPjF1tWkXYezfUypYVHekSL1GDjQmwETlSWkEICa79vPTn tvusqAYnyPPbg51dgjLJUyM5eNEbptlM0a/I+6G6s6VJiwWBWvzUY4UnpVNOwT+/um 1d8Lc9upujHrCa6BITuowZGIfID4SNs+lHtHxu/uxptFR+f8siGOQmga3MTmr+GGh6 X9Wf3jB4bYqH8Wd6yfMzEVQXq1yitauUBVytm4QlQ2pxFIbKlN1v/Y3hXvTwKP6phM vwW4h8Kms6jdqxcSN3u+HjPHcqD0jZhx4RWhzCRgbpHbnXVJZtuy23tYG5Q7NwpeL2 V0a9CshWU39Fw== To: FFmpeg development discussions and patches From: =?utf-8?q?Zsolt_Vad=C3=A1sz?= Message-ID: Feedback-ID: 28710920:user:proton MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/oggparsevorbis: Don't append to title 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eY7i09c8OvUm This patch fixes #9642. Signed-off-by: Zsolt Vadasz --- libavformat/oggparsevorbis.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 061840c2ed..02be4e07b8 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -134,9 +134,13 @@ static int vorbis_parse_single_comment(AVFormatContext *as, AVDictionary **m, } } else if (!ogm_chapter(as, t, v)) { (*updates)++; - if (av_dict_get(*m, t, NULL, 0)) - av_dict_set(m, t, ";", AV_DICT_APPEND); - av_dict_set(m, t, v, AV_DICT_APPEND); + if(!av_strncasecmp("title", t, strlen("title"))) + av_dict_set(m, t, v, 0); + else { + if (av_dict_get(*m, t, NULL, 0)) + av_dict_set(m, t, ";", AV_DICT_APPEND); + av_dict_set(m, t, v, AV_DICT_APPEND); + } } end: t[tl] = '=';