From patchwork Tue Apr 14 12:38:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 18952 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 AF83144011A for ; Tue, 14 Apr 2020 15:38:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9278168BA0A; Tue, 14 Apr 2020 15:38:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9FCB68B906 for ; Tue, 14 Apr 2020 15:38:19 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 1ACD1790 for ; Tue, 14 Apr 2020 08:38:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 14 Apr 2020 08:38:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=VJGMTZKoDDJx+cqtGUFEiErFrj OlEYujiTZ04BRqOPE=; b=XgJx82+ib2j6x1BZ007P1rhxRb03LpQgDLkS9WaZGL 5OzOC8xXbHWuOBs4A58wtQ80aOjSz/4Wvy4aeIbkqYebU7kd5JTIljbTo/Pw9ttW E02p7hJ4necIk/vYdufInOPoNE+6P2Mv9Xnxj4ssGDIODciM6K+Z2XFzJXNjPYRs rjj7SLi5DgjhVyNazlNP8PUowmf1fE9fHSDwDZRxucskw2pUSS/1wCGxeyyJ5Lko lnOourutAlSy8Q2ySLKm2l/8cOU3HJOPMSvh3bAn1Jt/vmxkwbiyLb0GJLqXdUfX eNIRwViCQisakUFk6MszXWwTID8+qWk2V29PulTVTekw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=VJGMTZKoDDJx+cqtG UFEiErFrjOlEYujiTZ04BRqOPE=; b=V5VUeCJR/unrQhgeC8sfGnseyFxiBGF1h Hhec8XymCukcXU3/HgJGcTWionNmc6cY0KV1N014Yiyaypb5UX/oa0hITB3xUWeT v91Wqeh4Qi1FRP5H6xFgAW1Fk+Wq7GGO0/YvHdCgGPNjFyEH6FeemjiVwVV/SHHR pHxD4kfsGovV0NPoLmnrtwmgQ0U5yUOkoUaUioFyXkBGe9y9s773D+GfWJVP4DdA r+Z+U3xc3XAifNOq3Fn8pcaB27g1kGNFmPraENcBCiipALHnoBGy72vxRHiCjwm7 0UWlwvOQvTm32C2EUdPU9/XFmnM9xnMtVdY2cWzUp4MrMqOxAV2qg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfedugdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeflohhshhcuuggvucfmohgtkhcuoehjohhshhesihhtrghnihhmuhhl rdhliheqnecukfhppeekuddruddtgedrjeekrdduhedunecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhhsehithgrnhhimhhulhdrlhhi X-ME-Proxy: Received: from localhost.localdomain (cpc107625-sotn16-2-0-cust150.15-1.cable.virginm.net [81.104.78.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 4BDAA3280064 for ; Tue, 14 Apr 2020 08:38:17 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Apr 2020 13:38:07 +0100 Message-Id: <20200414123809.77271-1-josh@itanimul.li> X-Mailer: git-send-email 2.24.1 (Apple Git-126) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc: stop using deprecated av_codec_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: Josh de Kock --- libavcodec/options.c | 5 +++-- libavcodec/tests/utils.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 35e8ac9313..babab599fc 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -55,15 +55,16 @@ static void *codec_child_next(void *obj, void *prev) static const AVClass *codec_child_class_next(const AVClass *prev) { + void *iter = NULL; AVCodec *c = NULL; /* find the codec that corresponds to prev */ - while (prev && (c = av_codec_next(c))) + while (prev && (c = av_codec_iterate(&iter))) if (c->priv_class == prev) break; /* find next codec with priv options */ - while (c = av_codec_next(c)) + while (c = av_codec_iterate(&iter)) if (c->priv_class) return c->priv_class; return NULL; diff --git a/libavcodec/tests/utils.c b/libavcodec/tests/utils.c index f6ba7fe66e..5041a4085e 100644 --- a/libavcodec/tests/utils.c +++ b/libavcodec/tests/utils.c @@ -19,10 +19,11 @@ #include "libavcodec/avcodec.h" int main(void){ + void *iter = NULL; AVCodec *codec = NULL; int ret = 0; - while (codec = av_codec_next(codec)) { + while (codec = av_codec_iterate(&iter)) { if (av_codec_is_encoder(codec)) { if (codec->type == AVMEDIA_TYPE_AUDIO) { if (!codec->sample_fmts) { From patchwork Tue Apr 14 12:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 18953 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 BE807445B8B for ; Tue, 14 Apr 2020 15:38:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC64B68BA10; Tue, 14 Apr 2020 15:38:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A29F68B9ED for ; Tue, 14 Apr 2020 15:38:20 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 8926640B for ; Tue, 14 Apr 2020 08:38:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 14 Apr 2020 08:38:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=mg9RxSIRHTDg8 W5B4yH38Qf2elHWzVvKSFS2fjfIOMk=; b=wjRMHJuthUHtcd0kDqhnrB/2zLYBT YqQ9rjGcXXfOkQ7qw4Jh1j4gObCfKnwPttiSoxSVL+xv1EV2Na8ehq23dfoev+f6 ldJrEzjvA91MIYmTPqkggCX948x5M2hA8mKdONggr50soi69UKMf+ZSkyFBbFLl1 S7tUeV8jrrwA9+61Q5NUrfrqPA1EFMwiwOLssywcP+e6QtEt0EvsqUEVvzq54QjA w/q7tAOza+8nDgrG8aFnyPDvpR/APSlC7x418qj1IFYsrlesaBkGQf0J7y6/i3k2 yS0Oq6DwKKoCWSWuwU6LBbxNhf6jCI2JQPoCV6SJWwEIJ8Kc633QRI7AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=mg9RxSIRHTDg8W5B4yH38Qf2elHWzVvKSFS2fjfIOMk=; b=QFUhB+3J ECMtIqM1xss9cMSV/SYyoGYGaMO9uswm/drQ0lqd0+m70QLD7GUJGc3SXI9qRDgL RDrm8zV1Dx+x9ibfSp0W+r7w4PuqSCCXenhJrvszx6yrqP32pc9uYHGcZ/OQR/Dw pvkcF2WzTt2IA9Btcihz7uFgVdIgjeULBf3yZofzto9ReWCvdC4/CKEcDkUegZwc hGaX9MuWIrMxRb8o6LyvcQRBX8mZOoLa7SteX8akghPnUUXWUX+4tLR1jOHkdlRq eBjhugVR9x3KupYJyuVNVC/1fTTdnSQsAvPkCY992v/ajVM0eayxtUwfaPBKyCJ9 E4xK+o4p/SFgUw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfedugdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeflohhshhcuuggvucfmohgtkhcuoehjohhshhesihhtrghnihhm uhhlrdhliheqnecukfhppeekuddruddtgedrjeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhhsehithgrnhhimhhulhdr lhhi X-ME-Proxy: Received: from localhost.localdomain (cpc107625-sotn16-2-0-cust150.15-1.cable.virginm.net [81.104.78.151]) by mail.messagingengine.com (Postfix) with ESMTPA id B4C263280069 for ; Tue, 14 Apr 2020 08:38:17 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Apr 2020 13:38:08 +0100 Message-Id: <20200414123809.77271-2-josh@itanimul.li> X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-Reply-To: <20200414123809.77271-1-josh@itanimul.li> References: <20200414123809.77271-1-josh@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/utils: stop using deprecated av_codec_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: Josh de Kock --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index a58e47fabc..4f777ba849 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -222,7 +222,8 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st, if (codec->capabilities & AV_CODEC_CAP_AVOID_PROBING) { const AVCodec *probe_codec = NULL; - while (probe_codec = av_codec_next(probe_codec)) { + void *iter = NULL; + while ((probe_codec = av_codec_iterate(&iter))) { if (probe_codec->id == codec_id && av_codec_is_decoder(probe_codec) && !(probe_codec->capabilities & (AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_EXPERIMENTAL))) { From patchwork Tue Apr 14 12:38:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 18954 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 ADA4044A211 for ; Tue, 14 Apr 2020 15:38:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D33068BA14; Tue, 14 Apr 2020 15:38:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DD3368B9ED for ; Tue, 14 Apr 2020 15:38:20 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id F340F7B3 for ; Tue, 14 Apr 2020 08:38:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 14 Apr 2020 08:38:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=BsVNttRL59ykO 2m3hXIKFf63Pth70YGvjE6huueAYZM=; b=UI8XmeDT7bMr8XVK3hMgrh1MM5s4g L+VvtcuurQO45WwB4Fvrs2SpuzGgRB/p6PRSwgSv6o9ASWxuQkcHzwYMEKrtU05P IZqfbrN3pdelHbjBV4xEMucdIo9CJEFnSsW2TEBIcW5TUmqP9TNNkd2mLlmjuPbU AOpwyDB6Ahi7lJQlX0VBYdXMlTsmVcEmfW6PrAV9myzDcTqs8l+4tW+Gx1ckUCbo UKSSBJlKRs6Hs6kVgkUeBZNOp0GvvyGij6guLT+ZON7RzYlrpnsWrBtbsV1Srg/m 7muHKhdJnidcfn0MlO0SB6XPbepdsBjFBiM9vganFH9/qEH//v53xjBnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=BsVNttRL59ykO2m3hXIKFf63Pth70YGvjE6huueAYZM=; b=Ojq+4YBO u9avjIzTX25nrrOumNRViHI2Wm72lxbWFgBbsSj4bdFtagVDgxs3w2JvE/7jKXmg BpY0sueV3lz8zwXbHq02K9GNRo7fq7PwSIHy8RpEiGm4L5CRkzbZ4P0DGCf4Ngw9 E5P3Vr2UCjuNv8SlxWmggMu/vuWFow/Ze3VRoilX5SEj4f3iTIubA/GpuEOp/A9W KXqEhxnYySRORqWxAvStrH+xbkGon+7FqDeV9yT4+jgNeKKa93LIe5yo/oZQB3Xf XFLWruPXmHWQMJ5wzzHaX1X4oCw8+D5KFrYW5SMLm6IAWrBu3vAZUnN3z/6b6Zcy xwtrFiWEhgPiaw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrfedugdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeflohhshhcuuggvucfmohgtkhcuoehjohhshhesihhtrghnihhm uhhlrdhliheqnecukfhppeekuddruddtgedrjeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhhsehithgrnhhimhhulhdr lhhi X-ME-Proxy: Received: from localhost.localdomain (cpc107625-sotn16-2-0-cust150.15-1.cable.virginm.net [81.104.78.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 34796328006A for ; Tue, 14 Apr 2020 08:38:18 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Apr 2020 13:38:09 +0100 Message-Id: <20200414123809.77271-3-josh@itanimul.li> X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-Reply-To: <20200414123809.77271-1-josh@itanimul.li> References: <20200414123809.77271-1-josh@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] tools: stop using deprecated av_codec_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: Josh de Kock --- tools/enum_options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/enum_options.c b/tools/enum_options.c index 28631d1a6b..548e427b7a 100644 --- a/tools/enum_options.c +++ b/tools/enum_options.c @@ -113,13 +113,14 @@ static void show_format_opts(void) static void show_codec_opts(void) { + void *iter = NULL; AVCodec *c = NULL; printf("@section Generic codec AVOptions\n"); show_opts(avcodec_get_class()); printf("@section Codec-specific AVOptions\n"); - while ((c = av_codec_next(c))) { + while ((c = av_codec_iterate(&iter))) { if (!c->priv_class) continue; printf("@subsection %s AVOptions\n", c->priv_class->class_name);