From: Marvin Scholz <epirat07@gmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Marvin Scholz <epirat07@gmail.com> Subject: [FFmpeg-devel] [PATCH 13/31] avfilter/vf_libvmaf: use av_dict_iterate Date: Fri, 25 Nov 2022 02:30:28 +0100 Message-ID: <20221125013046.40904-14-epirat07@gmail.com> (raw) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> --- libavfilter/vf_libvmaf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 8f649c5b02..2586f37d99 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -236,9 +236,9 @@ static int parse_features(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { char *feature_name = NULL; VmafFeatureDictionary *feature_opts_dict = NULL; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "name")) { feature_name = e->value; continue; @@ -295,11 +295,11 @@ static int parse_models(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { VmafModelConfig model_cfg = { 0 }; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; char *version = NULL; char *path = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "disable_clip")) { model_cfg.flags |= av_stristr(e->value, "true") ? VMAF_MODEL_FLAG_DISABLE_CLIP : 0; @@ -355,7 +355,7 @@ static int parse_models(AVFilterContext *ctx) goto exit; } - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { VmafFeatureDictionary *feature_opts_dict = NULL; char *feature_opt = NULL; -- 2.37.0 (Apple Git-136) _______________________________________________ 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".
next prev parent reply other threads:[~2022-11-25 1:32 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-25 1:30 [FFmpeg-devel] [PATCH 00/31] Use av_dict_iterate where approproate Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 01/31] fftools: use av_dict_iterate Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 02/31] fftools: use av_dict_get_string Marvin Scholz 2022-11-25 12:48 ` Andreas Rheinhardt 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 03/31] avcodec/librav1e: use av_dict_iterate Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 04/31] avcodec/librav1e: remove unnecessary variable Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 05/31] avcodec/libvpxenc: use av_dict_iterate Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 06/31] avformat/smjpegenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 07/31] avutil: " Marvin Scholz 2022-11-25 12:50 ` Andreas Rheinhardt 2022-11-26 14:42 ` Marvin Scholz 2022-11-27 13:59 ` James Almer 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 08/31] avfilter/vf_scale: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 09/31] avfilter/vf_coreimage: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 10/31] avcodec/libxavs2: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 11/31] avcodec/avpacket: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 12/31] avformat/vorbiscomment: " Marvin Scholz 2022-11-25 1:30 ` Marvin Scholz [this message] 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 14/31] avfilter/f_metadata: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 15/31] avformat/cafenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 16/31] doc/examples/metadata: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 17/31] avformat/movenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 18/31] avformat/metadata: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 19/31] avformat/flvenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 20/31] avformat/hls: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 21/31] avformat/lrcenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 22/31] avformat/dump: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 23/31] avformat/wtvenc: " Marvin Scholz 2022-11-25 12:53 ` Andreas Rheinhardt 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 24/31] avformat/ffmetaenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 25/31] avformat/id3v2enc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 26/31] avformat/nutenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 27/31] avformat/apetag: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 28/31] avformat/asfenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 29/31] avformat/http: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 30/31] avformat/matroskaenc: " Marvin Scholz 2022-11-25 1:30 ` [FFmpeg-devel] [PATCH 31/31] avformat/fifo: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 00/31] Use av_dict_iterate where approproate Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 01/31] fftools: use av_dict_iterate Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 02/31] fftools: use av_dict_get_string Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 03/31] avcodec/librav1e: use av_dict_iterate Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 04/31] avcodec/librav1e: remove unnecessary variable Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 05/31] avcodec/libvpxenc: use av_dict_iterate Marvin Scholz 2022-11-30 20:18 ` James Zern 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 06/31] avformat/smjpegenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 07/31] avutil: " Marvin Scholz 2022-11-27 15:06 ` James Almer 2022-11-30 22:06 ` Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 08/31] avfilter/vf_scale: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 09/31] avfilter/vf_coreimage: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 10/31] avcodec/libxavs2: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 11/31] avcodec/avpacket: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 12/31] avformat/vorbiscomment: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 13/31] avfilter/vf_libvmaf: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 14/31] avfilter/f_metadata: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 15/31] avformat/cafenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 16/31] doc/examples/metadata: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 17/31] avformat/movenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 18/31] avformat/metadata: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 19/31] avformat/flvenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 20/31] avformat/hls: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 21/31] avformat/lrcenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 22/31] avformat/dump: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 23/31] avformat/wtvenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 24/31] avformat/ffmetaenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 25/31] avformat/id3v2enc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 26/31] avformat/nutenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 27/31] avformat/apetag: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 28/31] avformat/asfenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 29/31] avformat/http: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 30/31] avformat/matroskaenc: " Marvin Scholz 2022-11-26 14:46 ` [FFmpeg-devel] [PATCH v2 31/31] avformat/fifo: " Marvin Scholz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221125013046.40904-14-epirat07@gmail.com \ --to=epirat07@gmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git