From patchwork Sat Oct 10 03:45:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22824 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CB0BE4497F7 for ; Sat, 10 Oct 2020 06:45:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A866568BA0A; Sat, 10 Oct 2020 06:45:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0063568BA07 for ; Sat, 10 Oct 2020 06:45:44 +0300 (EEST) Received: by mail-qt1-f182.google.com with SMTP id c5so9704023qtw.3 for ; Fri, 09 Oct 2020 20:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IZPHDcnRHbDDjbJF6GTE5RaG57YvzPdARJh9ZBRgNqA=; b=txSaSYXPtX3b2LVxW2TsLxYN094UrYBqwvuXRbRjodMbyOVAoQxHdEY3G40iD7LlZY ODoVZjwz1YPd49nXSI8pRS0s68JTvX95MArgg+dwFmYJ5TqRe9XN8S2f47DkdbsFqNUs suqjrd317PyXPDkYy3vFtfRkwdeBbV4dHcF0iyxmMV1eIEpwOzZDAvVD6xEVAObcxyaC KUueCrnqWTZACNGIUgHTl/9rNqZJTVQ9V9CZ++OwwvvrLe6eEK5Zrb3oeF/2j8wZsbKy J0Glvo8pWNaJkV9FG0SPS2GPDSxxGpDt6ho+tLBsHa/FkdJkZQZ080fqj1KLhIQzttx/ ZzvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IZPHDcnRHbDDjbJF6GTE5RaG57YvzPdARJh9ZBRgNqA=; b=G8rdPiSclO2DhGJBAvZvU7z5lf9KqEcS1GaA6VEXXudJJZ/RvseSTa2146A2s8Qh0C VWzX4iYEbxUMSu+CP3sFoL2msvLnYkoxDfvUcoqKLZgM0D563+Heh52CA9ZGB2CP7NMw lcvlGprGyLWj5CDL33be/tGbiWZ1GJdPNXkyxc5P0SiJ2qOEP0G9R8O6u0VUBNmC4+8h Iy4IPovq0Parv6wELwLWwElUZ2s2J56MvGhCAzKC1kovUEibFUR485co6cf97VdzKIr8 OmePr0OJ7hxIfc1mz0FZkx23URVxf2Id8vkjixittBK8kXdWdYZ4ZqaEPednE2nyEh4H rhIw== X-Gm-Message-State: AOAM532dn1Bn+jjcc2oWyt3/Eb//hEMR1hol34CSXUTMYB5xB8A4da2z 8yw1aQahLoO9Aa+fg0wrmB/0b9nZkQSyQQ== X-Google-Smtp-Source: ABdhPJwNtbOV0N5YGKfPAqfxu99Xs5nV8KHfoh8kNaBg9wcYcSVpuhz4T0wZJAWk874oFfeXWHWNJQ== X-Received: by 2002:aed:362a:: with SMTP id e39mr1054215qtb.121.1602301542951; Fri, 09 Oct 2020 20:45:42 -0700 (PDT) Received: from localhost.localdomain ([181.23.78.153]) by smtp.gmail.com with ESMTPSA id r129sm7578517qka.32.2020.10.09.20.45.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 20:45:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Oct 2020 00:45:27 -0300 Message-Id: <20201010034527.21826-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201009201811.10710-1-jamrial@gmail.com> References: <20201009201811.10710-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avformat/options: use the iterate API in format_child_class_next() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavformat/options.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavformat/options.c b/libavformat/options.c index 3160904fda..59e0389815 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -55,35 +55,38 @@ static void *format_child_next(void *obj, void *prev) } #if FF_API_CHILD_CLASS_NEXT -FF_DISABLE_DEPRECATION_WARNINGS static const AVClass *format_child_class_next(const AVClass *prev) { - AVInputFormat *ifmt = NULL; - AVOutputFormat *ofmt = NULL; + const AVInputFormat *ifmt = NULL; + const AVOutputFormat *ofmt = NULL; + void *ifmt_iter = NULL, *ofmt_iter = NULL; if (!prev) return &ff_avio_class; - while ((ifmt = av_iformat_next(ifmt))) + while ((ifmt = av_demuxer_iterate(&ifmt_iter))) if (ifmt->priv_class == prev) break; - if (!ifmt) - while ((ofmt = av_oformat_next(ofmt))) + if (!ifmt) { + ifmt_iter = NULL; + while ((ofmt = av_muxer_iterate(&ofmt_iter))) if (ofmt->priv_class == prev) break; - if (!ofmt) - while (ifmt = av_iformat_next(ifmt)) + } + if (!ofmt) { + ofmt_iter = NULL; + while ((ifmt = av_demuxer_iterate(&ifmt_iter))) if (ifmt->priv_class) return ifmt->priv_class; + } - while (ofmt = av_oformat_next(ofmt)) + while ((ofmt = av_muxer_iterate(&ofmt_iter))) if (ofmt->priv_class) return ofmt->priv_class; return NULL; } -FF_ENABLE_DEPRECATION_WARNINGS #endif enum {