From patchwork Sat Oct 10 03:45:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22825 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 CF50244A0CB for ; Sat, 10 Oct 2020 06:46:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B645668BA31; Sat, 10 Oct 2020 06:46:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68EE568B6E2 for ; Sat, 10 Oct 2020 06:46:10 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id a9so9680311qto.11 for ; Fri, 09 Oct 2020 20:46:10 -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=nPcK7GpfOvotfgrbyCo5yASNZSPdfxAKSnPIJP7rQN0=; b=aDopR3BY4ApAM4Py41IW8CH0OuJysbIRr3ZXmFIsELR+93DFltSrwXQdFQKAxU/GmU dZB3ZxDlPyGbiauSmM+IuADMoe1MGXXbtO/ZAgdmqiDlboptKkPcEaZT8IggBqvM8XDq Esnl9LKDvoacTXqKwwaCXSlF4j34BJ0jVEGD5lEfY0DKcs5pTvYQHvzuyQ1/R4owpTlo QDliAS6ovIL3Utq0O3N5i1CA91ZwsJ4XKaljd2ku8hFrnlLSv2j3v/ZO9TXXfM9VzVA3 Q7qzW5SBqAiQOQ9uYDHF5XRkx+5/0o92IYj6ZWtKIO0K4K7si9VkjPnzxOtGqGWolSYR 91qA== 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=nPcK7GpfOvotfgrbyCo5yASNZSPdfxAKSnPIJP7rQN0=; b=Utxq1U4ZuooQe4EXXXzxW3v6zRRew4jJL67AkD8KjbSOqQiBeldEl5dxDAQCkZcJG9 NbzTZtaj933Pfs1L57U7t+nS1l+5S1HY4eVsX+nDd3aJj11pUL+50w1y+vlEbVYVDHsX kjuei3jXJiHNFcKh0O5jn3hr8z5voMDSU0whvR7azi4xT8TGIXBrr8MYV9DpV6eNvIra Cv5gsGoQOdvmuYvVraMBr3WYM2ldTyapIEcE1WWOrpwLcZ4plnzsRFEgzA2q5eiyXABS GSKw8oz4mnPuyuNSRumj/SIvoY/cPGWX8H1Z2XWPdenVwFVsYzxg3roW2o2OV88QeNF+ G3cg== X-Gm-Message-State: AOAM531Sm5ZaSK7Kcs4iOLnBV72Ybtj0p+VIj0XCf64AlU9aFw4wdtDE nImJtQXjw5E+Uy7hGtVB+JFbaRGK/vujHg== X-Google-Smtp-Source: ABdhPJwV5CH+0U6wbNKdi/c8jGzYy/kJRbQ18ULte1xHfS4vH3fFqXKUQsXxEW1H9u7j7+2nqqBPNg== X-Received: by 2002:ac8:5acb:: with SMTP id d11mr1033367qtd.161.1602301568944; Fri, 09 Oct 2020 20:46:08 -0700 (PDT) Received: from localhost.localdomain ([181.23.78.153]) by smtp.gmail.com with ESMTPSA id s10sm7584316qkg.61.2020.10.09.20.46.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 20:46:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Oct 2020 00:45:52 -0300 Message-Id: <20201010034552.21874-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 5/6] tools/target_dem_fuzzer: switch to the iterate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- tools/target_dem_fuzzer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c index eefb5c5fa3..10082993fe 100644 --- a/tools/target_dem_fuzzer.c +++ b/tools/target_dem_fuzzer.c @@ -105,8 +105,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { int ret; if (!c) { - av_register_all(); - avcodec_register_all(); av_log_set_level(AV_LOG_PANIC); c=1; } @@ -132,15 +130,17 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { filesize = bytestream2_get_le64(&gbc) & 0x7FFFFFFFFFFFFFFF; if ((flags & 2) && strlen(filename) < sizeof(filename) / 2) { - AVInputFormat *avif = NULL; + const AVInputFormat *avif = NULL; + void *avif_iter = NULL; int avif_count = 0; - while ((avif = av_iformat_next(avif))) { + while ((avif = av_demuxer_iterate(&avif_iter))) { if (avif->extensions) avif_count ++; } avif_count = bytestream2_get_le32(&gbc) % avif_count; - while ((avif = av_iformat_next(avif))) { + avif_iter = NULL; + while ((avif = av_demuxer_iterate(&avif_iter))) { if (avif->extensions) if (!avif_count--) break;