From patchwork Sat Nov 2 15:47:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 16074 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 C0C40448FC1 for ; Sat, 2 Nov 2019 17:47:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4AA568AFB8; Sat, 2 Nov 2019 17:47:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m964.mail.126.com (mail-m964.mail.126.com [123.126.96.4]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1B9D68AF69 for ; Sat, 2 Nov 2019 17:47:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=f3OqixsTfT69dvxxnP wl8hSobYHy/qNRwxDD6j+V31c=; b=TvUGcXthdp5XAt5rGBC9Av/dOpSq53uvvq clxqXrcI+W2hhRWkpLLIo1u5cx1DFs0EU9OhZgCHAiGX3qyDApGg41JeYN9zq4qA vn/ZFkfFD9kCDQbRy87Zg0qGCoVVIP+636sP8npi9HPep1Jky+Qi0nM2jUFoJ6NN TTHrCcN/4= Received: from localhost.localdomain (unknown [112.64.2.210]) by smtp9 (Coremail) with SMTP id NeRpCgC38aH3pL1dC4xmCA--.91S2; Sat, 02 Nov 2019 23:47:05 +0800 (CST) From: zhongli_dev@126.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Nov 2019 23:47:00 +0800 Message-Id: <20191102154701.809-1-zhongli_dev@126.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: NeRpCgC38aH3pL1dC4xmCA--.91S2 X-Coremail-Antispam: 1Uf129KBjvdXoWruFWftFWUAFWrXry5Aw17Awb_yoWDWrg_ur nFq3s7Cw4rJF929F1Dur17urWkG3yUGFsxurnxK3WfAa4DAFn8KF10vrZrCFWS9FZ0vryf CryqqFnYkF1j9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xREhSdtUUUUU== X-Originating-IP: [112.64.2.210] X-CM-SenderInfo: x2kr0wxolbvvby6rjloofrz/1tbiKQ1hwFpD+arqHwAAs6 Subject: [FFmpeg-devel] [PATCH 1/2] tools/probetest: replace the deprecated API 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 Cc: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Zhong Li Signed-off-by: Zhong Li --- tools/probetest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/probetest.c b/tools/probetest.c index 2c6c1de246..cfa309cabd 100644 --- a/tools/probetest.c +++ b/tools/probetest.c @@ -38,9 +38,10 @@ static const char *single_format; static void probe(AVProbeData *pd, int type, int p, int size) { int i = 0; - AVInputFormat *fmt = NULL; + const AVInputFormat *fmt = NULL; + void *fmt_opaque = NULL; - while ((fmt = av_iformat_next(fmt))) { + while ((fmt = av_demuxer_iterate(&fmt_opaque))) { if (fmt->flags & AVFMT_NOFILE) continue; if (fmt->read_probe && @@ -66,8 +67,9 @@ static void print_times(void) { int i = 0; AVInputFormat *fmt = NULL; + void *fmt_opaque = NULL; - while ((fmt = av_iformat_next(fmt))) { + while ((fmt = av_demuxer_iterate(&fmt_opaque))) { if (fmt->flags & AVFMT_NOFILE) continue; if (time_array[i] > 1000000) {