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))) {