From patchwork Sat Nov 26 14:46:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219101pzb; Sat, 26 Nov 2022 06:50:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5xK9XhQOy73hBpQUH/4IH7VaZ1z7XDzz7q7Hl+s+d282AZaM8zVaKa/tZsTiPs5vzDYxtr X-Received: by 2002:a17:906:ad97:b0:7bc:42f6:153d with SMTP id la23-20020a170906ad9700b007bc42f6153dmr8249082ejb.204.1669474234567; Sat, 26 Nov 2022 06:50:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474234; cv=none; d=google.com; s=arc-20160816; b=PbYAVrrIPmpq631s+Rm8jBymQeqUTmLD1hLpiwLfvxuZAo8cuK7r4CBB/IByzrUALo Cg4Po/Eb/qRSRm/zZLxpNTCH1LAV3zh0IOzisZwi8ZMtHLtVioZ4rMxvEPaRoHhOfbW0 IINkt1D/DMkZrQcWkdG9MkI/KT/8h5vr1zYBBOl2Rf0738Der/A8trYOLk+q8v8oRIAI xfgz0/1fFYPm1DWYFjI7l0q3UnlaCrCSQgDAfixkAg0DysWwNnJf59lu38Nu0CC7TJso j5+axHCWns5kOM8MShOTgCoBa5oHgM0HxUS81UnVi9IM/v87HANuorVPRJc7ebA+Oh99 hGdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=8P/eu7JJz3HY7AWQSLGFcTGy2VmsE5eMUA5VTXpKq5k=; b=Gk2fbqRnocaDFnoASwngeFDtffZJQQN5S5XvOn1LDytw0b7qd9N0LJDh6yj4bYnOk6 x4yIlT0uXONDFxmEQ7gj7p0MRd4VD+dZvZQ28roJ+LK4rho3wYmksidbCzIjsmcDtibR goVMLff8H66NkGyZyIbh29I0/oIEJTjcxCi/onR8ZA/0Pgv53WdItMGFc5VtB3BsSsGu Cgw13mcexo+oZ4qHCHXGilumd+uWG9revt+AO40+2ZAGneRXplcecX8Vfs97MJwTE5oS mXSUXHzUpZMAAw4GQfHo5hmSAUFP81s4gvCQ/I4uF5CIJCRUpH0eE//1iYOjpUdXMbK1 zQfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OX3ILk51; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h8-20020a05640250c800b0046abb9e43a8si4945565edb.321.2022.11.26.06.50.34; Sat, 26 Nov 2022 06:50:34 -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=@gmail.com header.s=20210112 header.b=OX3ILk51; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD1E568BC0E; Sat, 26 Nov 2022 16:47:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCB1268BB5D for ; Sat, 26 Nov 2022 16:47:15 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id x102so9954889ede.0 for ; Sat, 26 Nov 2022 06:47:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=usF8IYSm4A8E4G8ZBIFm+bYtC1XpOWWOV+xjiBQExXg=; b=OX3ILk517ZDSgFeEQxCurtopB0JGhy3VC6Ulv5W672WxGJ+O4KUAfeR1zdZR0H988o csiqnzjxcBtpkHIrqFlqSW+NLmzm7RKh783ooIcKUJ2lUljFYk8gh2g4dZOlJRSSshZo DpOjbZkkH6jAudqhdZ7HG0uaIhbOszgGCawt81dgMIdLqvGHXmHX01kr1z2DE3q4HXbj dT3wm75d1KYdQUjqB2nqVXuKocDhGepMxDMzGGIEy0nWBllKXfkZfA5E8mrXehjdlRxS YjrJyqD41QSDnr8iaF7gQ6/yuNMLKMlupL5Y4+JYM5clyRYXV6Rw4bUdhgujpPoHDxtp n9jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=usF8IYSm4A8E4G8ZBIFm+bYtC1XpOWWOV+xjiBQExXg=; b=VZATu9ex6I6M8YupvYJxlKGaMT6/2vLH1ggLbiMa0cdBTkdbX3+dI8zwW1vwA3ZI0+ 2m5JqIjvnM7ahVhK4w+3bQ4xU0nBDhSfvFoz8GXh3hQ0eOY9WWk9rbRMBCEEmbXnEPuY oXiHtf4uFyL+RIf7aPnxoz42bAHkPUpfXp28+EHu45VwxoR3YrE3y+nKrINIQZQ2ItLv JQN85vf7z5k/4kSc6Q7SF/0MRAP9ZrHCZrrrpf48wfDvGYWDjU0UjUD+dUEBw8TcAZqd 8kFX1FTrn6cTO1BcQO1CQnptuAB9s0MREWjQhPc01n1SasRchOeN+BoGrfxy9r7v9Wc9 tRaw== X-Gm-Message-State: ANoB5pmMBF71Z4C7fzRQct8mxwxpuWEQpP2OBqBq+pOidnsInzOswDgD E3SWH7yFvHDx4dTMMpyHHvtlvoNB5m0= X-Received: by 2002:aa7:c788:0:b0:458:b9f9:9fba with SMTP id n8-20020aa7c788000000b00458b9f99fbamr24007193eds.305.1669474035606; Sat, 26 Nov 2022 06:47:15 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:15 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:42 +0100 Message-Id: <20221126144648.73162-26-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221126144648.73162-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> <20221126144648.73162-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 25/31] avformat/id3v2enc: use av_dict_iterate 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Bww092AN6+C/ --- libavformat/id3v2enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 515d2efd7d..ac907c2758 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -150,7 +150,7 @@ static int id3v2_put_priv(ID3v2EncContext *id3, AVIOContext *avioc, const char * return len + ID3v2_HEADER_SIZE; } -static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, AVDictionaryEntry *t, +static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, const AVDictionaryEntry *t, const char table[][4], enum ID3v2Encoding enc) { uint32_t tag; @@ -167,13 +167,13 @@ static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, AVDictio static void id3v2_3_metadata_split_date(AVDictionary **pm) { - AVDictionaryEntry *mtag = NULL; + const AVDictionaryEntry *mtag = NULL; AVDictionary *dst = NULL; const char *key, *value; char year[5] = {0}, day_month[5] = {0}; int i; - while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) { + while ((mtag = av_dict_iterate(*pm, mtag))) { key = mtag->key; if (!av_strcasecmp(key, "date")) { /* split date tag using "YYYY-MM-DD" format into year and month/day segments */ @@ -220,7 +220,7 @@ void ff_id3v2_start(ID3v2EncContext *id3, AVIOContext *pb, int id3v2_version, static int write_metadata(AVIOContext *pb, AVDictionary **metadata, ID3v2EncContext *id3, int enc) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int ret; ff_metadata_conv(metadata, ff_id3v2_34_metadata_conv, NULL); @@ -229,7 +229,7 @@ static int write_metadata(AVIOContext *pb, AVDictionary **metadata, else if (id3->version == 4) ff_metadata_conv(metadata, ff_id3v2_4_metadata_conv, NULL); - while ((t = av_dict_get(*metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(*metadata, t))) { if ((ret = id3v2_check_write_tag(id3, pb, t, ff_id3v2_tags, enc)) > 0) { id3->len += ret; continue;