From patchwork Sat Nov 26 14:46:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 34865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217158pzb; Sat, 26 Nov 2022 06:47:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf660aCHxVUM3Uq3DlxDvk2kRUXfaqWNX6aqHu3eK+9iX5Om2diDfz9WiSLtOd3cd94tVvb8 X-Received: by 2002:a17:906:3a41:b0:78d:9caa:31b7 with SMTP id a1-20020a1709063a4100b0078d9caa31b7mr22451864ejf.263.1669474028170; Sat, 26 Nov 2022 06:47:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474028; cv=none; d=google.com; s=arc-20160816; b=bCSDWbZ3jQ+ASflVIaDdrJLveHwUx9Kn29XKNDE+ez7yr+WbNtTvS5yRxIR6RCkaba x9USAWQ8Tm9PAWMmFRCSAogpXndDv5BvI27y2aDWm69mX09jAoAKJFsxpUZRN/sn2y3N NJsDTasZ0Zj8fiRwX9TUXQffuW7wPXFwlWzlMaVCmwwIVVdOug2TGJrF0pP74q50IXOD GD41UXcMjqz1cYnR52A+s4FpDy6geyswfcUX6wp2Nb6Ij8FwqbhTW21DkIvg9HwFOR8p jd+N/UaZ+WOah+SkHUp9zGayaePVdVFSIjgWEwYUWM8CJ9GBWeUmLTH5Wt10rUsAKTDC tZwg== 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=uMvcmgW+nTn9mW/+yXvBzh/N8Wffgd/xIV09oXidljc=; b=jASKNfE7WLkQDX3w9giELmg89CkkKJTws3UXSbepAnSm6BQQkHa6T7WjJl78Dviuv5 ZeTHbSQSqEe9qypF7opM5vN9hX2tJi7xDH0cfdlh/TDfYu5VCb5AX97iKPJ2QLBMm0Cq 6COtROQk4iTzT0AtkpSUlG90NuZDVpuWCMitPA5w1WI9DNKHHaDrvGXW0oRVZ/G43/OH ikoFHBosWjGSC9txqrxp6MGZ0qMEBkKNtFMABmjSxcaj+Xd5XIgzEGJuXvE2f78Kl5Xj RgH+FoWFlLxaDtzs9NGTXPPpJ83sNy81UHI4OoW5ilUrmLppTMlD09SBWi9mQQ2WYvwj 8bQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CtXr04c0; 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 xj14-20020a170906db0e00b0079dccbbf0c0si5502516ejb.146.2022.11.26.06.47.07; Sat, 26 Nov 2022 06:47:08 -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=CtXr04c0; 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 0B05F68B95E; Sat, 26 Nov 2022 16:47:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 177D86801C8 for ; Sat, 26 Nov 2022 16:46:58 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id e27so16024118ejc.12 for ; Sat, 26 Nov 2022 06:46:58 -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=ZlChSwDQmsLKF6PMl8gAzsuCTvSSlZj8o+QOVedr130=; b=CtXr04c0X6/OiuzGTAwEyueppaFxkgZYS20obHZPorucwEzv5/rbXeIBjAz08mVL1w 5Jm5S2dhU0HXfpYVIawZQ3lHdk/oLqZdniljGUsND8NPcJlenfQaAV+m6yd8HHZV+Tie X3mr71ePTiQ2HDmGxoFHy9VHWYvIqr6Fq+RcCZRKRRo6qtmHPcwsJBGTJBL35geemCz6 Zm9aZH6m6YniADgvKl/hOUmiZKYnuX3zv67Vqjb7P4HYGpIP7DwzFXR5st5/IW0aPhF/ JPp4VZjroWewOxxWmVocAKQKs+Xrd1lXc0cADL5aoyoEEj/KqUTIOL717TdOEQtLssaL aGuQ== 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=ZlChSwDQmsLKF6PMl8gAzsuCTvSSlZj8o+QOVedr130=; b=g2b5Xexy5IA68nD53kPdScnLlol1x9WpUfOkMJ4zMdXySuYUS3KluRFIhlIhXSMYEf gFmGQv3OwCI3iY6iSGzMSnKdbdXQG020nHywB87SFgYteLtRp5xdL/ODmy25VBH9vKaP IsnlDJNEotpTVioBI/65l8NsN+EoGpDiQGbQ4zcZ/jKoZb2VemvCRnvAHOmOinAg6fJu Ju/8F+ypV3LfkyYNt506QRgSb3lb21qi6qOGa2iPnAtCkHhXwKrRLARukE5+tjry8jYS 2tRHDIl08bewQRJmQcTuGSpkXl7+YWi7EGonJydyRReWzLREo/6ixyPEKpg4U+vR/JJA uvvQ== X-Gm-Message-State: ANoB5pnlEqHZc0qDlG3THApGL1XEm8ScSUJnO91amveXz9kzcC861shI wK+S7p/V8CUigv9Sidssun28r1LOUWM= X-Received: by 2002:a17:906:1495:b0:7ad:d250:b904 with SMTP id x21-20020a170906149500b007add250b904mr20736739ejc.633.1669474017382; Sat, 26 Nov 2022 06:46:57 -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.46.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:46:56 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:17 +0100 Message-Id: <20221126144648.73162-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 00/31] Use av_dict_iterate where approproate 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: 71kiTzEpagZ9 Changes to v1: - Fixed 0 used as NULL pointer in wtvenc - Dropped change to the dict test - Narrowed variabel scope/removed unnecessary variables in fftools/ffmpeg_filter.c --- This patchset replaces the common use of: av_dict_get(format_options, "", entry, AV_DICT_IGNORE_SUFFIX) with the new av_dict_iterate in most places where it makes sense. It is more concise and clearer to understand the intention of the code. Additionally for fftools/ffmpeg_filter it switches to av_dict_get_string, as it makes more sense to use the proper API for that instead of manually assembling the string. Marvin Scholz (31): fftools: use av_dict_iterate fftools: use av_dict_get_string avcodec/librav1e: use av_dict_iterate avcodec/librav1e: remove unnecessary variable avcodec/libvpxenc: use av_dict_iterate avformat/smjpegenc: use av_dict_iterate avutil: use av_dict_iterate avfilter/vf_scale: use av_dict_iterate avfilter/vf_coreimage: use av_dict_iterate avcodec/libxavs2: use av_dict_iterate avcodec/avpacket: use av_dict_iterate avformat/vorbiscomment: use av_dict_iterate avfilter/vf_libvmaf: use av_dict_iterate avfilter/f_metadata: use av_dict_iterate avformat/cafenc: use av_dict_iterate doc/examples/metadata: use av_dict_iterate avformat/movenc: use av_dict_iterate avformat/metadata: use av_dict_iterate avformat/flvenc: use av_dict_iterate avformat/hls: use av_dict_iterate avformat/lrcenc: use av_dict_iterate avformat/dump: use av_dict_iterate avformat/wtvenc: use av_dict_iterate avformat/ffmetaenc: use av_dict_iterate avformat/id3v2enc: use av_dict_iterate avformat/nutenc: use av_dict_iterate avformat/apetag: use av_dict_iterate avformat/asfenc: use av_dict_iterate avformat/http: use av_dict_iterate avformat/matroskaenc: use av_dict_iterate avformat/fifo: use av_dict_iterate doc/examples/metadata.c | 2 +- fftools/cmdutils.c | 2 +- fftools/ffmpeg.c | 2 +- fftools/ffmpeg_demux.c | 5 ++--- fftools/ffmpeg_filter.c | 36 +++++++++++++++--------------------- fftools/ffmpeg_opt.c | 2 +- fftools/ffplay.c | 4 ++-- fftools/ffprobe.c | 6 +++--- libavcodec/avpacket.c | 2 +- libavcodec/librav1e.c | 7 +++---- libavcodec/libvpxenc.c | 4 ++-- libavcodec/libxavs2.c | 4 ++-- libavfilter/f_metadata.c | 4 ++-- libavfilter/vf_coreimage.m | 16 ++++++++-------- libavfilter/vf_libvmaf.c | 10 +++++----- libavfilter/vf_scale.c | 4 ++-- libavformat/apetag.c | 4 ++-- libavformat/asfenc.c | 4 ++-- libavformat/cafenc.c | 6 +++--- libavformat/dump.c | 2 +- libavformat/ffmetaenc.c | 4 ++-- libavformat/fifo.c | 4 ++-- libavformat/flvenc.c | 4 ++-- libavformat/hls.c | 6 +++--- libavformat/http.c | 6 +++--- libavformat/id3v2enc.c | 10 +++++----- libavformat/lrcenc.c | 3 +-- libavformat/matroskaenc.c | 2 +- libavformat/metadata.c | 4 ++-- libavformat/movenc.c | 8 ++++---- libavformat/nutenc.c | 12 ++++++------ libavformat/smjpegenc.c | 4 ++-- libavformat/vorbiscomment.c | 14 +++++++------- libavformat/wtvenc.c | 8 ++++---- libavutil/opt.c | 12 ++++++------ libavutil/tests/dict.c | 2 +- 36 files changed, 110 insertions(+), 119 deletions(-)