From patchwork Fri Nov 25 01:30:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 34864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948119pzb; Thu, 24 Nov 2022 17:31:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dtG6vcJhbbUxc/b0HJwDt4bWjkUH2tuD0bgcwMndGyqfmLkfkt4xET9URazIiHVAInKkL X-Received: by 2002:a17:906:c1d0:b0:7b4:64d3:e6f4 with SMTP id bw16-20020a170906c1d000b007b464d3e6f4mr15410775ejb.594.1669339865075; Thu, 24 Nov 2022 17:31:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339865; cv=none; d=google.com; s=arc-20160816; b=xaaTUVmtp35G3Vy4LoHyNPMXZ78aTcaoz3rBxawv2wTFvIzQ/p8Tx8os84ZbGzl1j7 PsxOKjm/HTJ5uTWPyEeT4eo2axehwQrxmO8nNugQgiD5JXv6511PNTXr4DX8Dgwvj683 0jBkwgl7EMHJ/0yoOKrS31GzVBjjcwXDWWBR+tyz1AI2cHO1+LSjTOrLvoMX3sB5mYyN eQl9EF8JURcgdbZoG2a+nR6gXjDEAKYQWO1F9RfezivWQaVL6drZJnlcqMo95PGGMN4V 8X+z0sqDpuy9jJd20I2J1WdtMd20wnHRtSM/EmVSEastfwbBS52+iHXepYz9vEFnLXvW zqMw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=rTRRRi39q8zA1ZV+hyTx22+HlK0sUPc6+Rry/s5RRV4=; b=oSbxwd/5p/JJS4RckPsjUMxvxuj7uGlSXtEVTtGf0itRluCW5thcjTHnriQsOyGxHn li4SSDmkvghOkfygm0HqGusr3YtOEDr6QiW9R6LrJrfCMk6VNdM+OFOizLFgXzeolu+V 6OQc6FwkZu+Ktk9H0n1RhygP1ATmaRcxxTLhWzTbXD/h5+EP1jKopG8dxNOZQ2d2DwkD FVmoUTxX3avhxYoH44mCyC1iL6dRoJ+g21rDU1yBNkwZEv7BkLlccNgGbxXPYqFxM9+K ELYUUyKkzwriAxKeB94M0J1zzY96c18uAKeBkGXfdIVH1f6apFsQk8qwlriAv0eAOr7w LuXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qR2oufW5; 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 s25-20020aa7c559000000b00469634340b4si2057322edr.285.2022.11.24.17.31.03; Thu, 24 Nov 2022 17:31:05 -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=qR2oufW5; 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 78A4868BA9D; Fri, 25 Nov 2022 03:30:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B49E968B48D for ; Fri, 25 Nov 2022 03:30:52 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id ho10so7289777ejc.1 for ; Thu, 24 Nov 2022 17:30:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=uwgRkrbEu/uN/xz6Xphs3BePN7nfMGFqtbzRxlyHv+8=; b=qR2oufW5ZSFlnN0enpY/SBJ5V9ihW4T15MWLQM2I7IR5dEe3D/0E5cLRJhg37h08g/ jYlXmwxPaaxTFFSwpMdblePoLppSaQUcDamXp0GxXh8JwAFYEM8HSSbXimpQQCpNXQ7J +s+wbzCAGU358sIcWcxQgkZTKy5rBdNMDmXbKO/2Vkjt37yegXpAdNi1po0O4Wn1QpeV eN4IgSl6OT1U2Lkk+R5eZEkYuwIRzRi0Fp2U2E91/gT7rkJJBii31uyt069hF82Ts0Lt zzpG5gWzHhLqaH1HNbV6DyxSofE1fXTOjeilMVUu1JEhH3HRUfKAsv6yaXrrhXYNycyp VM6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uwgRkrbEu/uN/xz6Xphs3BePN7nfMGFqtbzRxlyHv+8=; b=yo9CMllqt1f52F8LggmxWP+h8+Qq88TKpuvEjDgotoRE0X7YxjX6mDCPAeyzS12cV4 +7aqnnN4s++d48662DI9gqNn/ODwRQ/emg9eDVdgNC5milgfwXaFOCsBSG4n0SjQaJJs NeD2IEB/OBd55LAwElEgSl7H8HNPG5fErqNSTg9GB27K8fimmDr4NLocUTaLXt2qu8Wf LUy3wdT8o9oCOcakHsy9JQu/hvVzuTZT4n5n7iPJqlVf5cVRifemhPwZDDnaXV9etBY8 5r0kFZ9w63p1j+HC6AVLXey/q0TVmEkJlvivM+EgGPo0Fu//mfdw2JddHPu/upZrbfdN GemA== X-Gm-Message-State: ANoB5pmrfSFjMnEzkGrzdqMNa2eWU2l4i0poPG4jCbKd9G9LirrHGRyE mLuiUzhe5pHKkqLZhO0PKGz30FGIn8w= X-Received: by 2002:a17:907:d092:b0:7ad:7e85:8056 with SMTP id vc18-20020a170907d09200b007ad7e858056mr29545065ejc.40.1669339852048; Thu, 24 Nov 2022 17:30:52 -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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:51 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:15 +0100 Message-Id: <20221125013046.40904-1-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 083vnWZJFEvx 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 | 34 ++++++++++++++-------------------- 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 | 10 +++++----- 36 files changed, 113 insertions(+), 122 deletions(-)