From patchwork Sun Apr 1 02:39:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 8268 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1181948jad; Sat, 31 Mar 2018 19:40:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+nSP0oee8oo/C6tQxK0wPbcbPcp6aquOYc19UBMUEoxWtBnQnyfbGldY3+NDbyuqUdNzA3 X-Received: by 10.223.170.72 with SMTP id q8mr2907190wrd.140.1522550410401; Sat, 31 Mar 2018 19:40:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522550410; cv=none; d=google.com; s=arc-20160816; b=yA3QzABKsyMBKTtK0i4wUJBfBztdWu5gjQhnT1u3j5V1JVy0ACM8G3BGjZz4azI4Iz /bsSGhCtmw7OKuJSv8vdVP4sZJzzPPmqROsuFYDyxGPKAiJLtwCFetewDD64fJs2gbf3 8nm/gVlsw/n+o7FhPadEyRqRFA0KRRDDr9/quLK+i82DqxmklugppFgBq0spWOT2VR3x n8Nr1OQMyRDDdNmap3VG0qcBKdAsQ677dPkDC9CGv7XFUzMxfpypD96KwJuHra20FL64 1a9AkwH1ZqKqMnXppgtc7lj7ihzgHyfm3975bs3+0yovylL4HVdKfEHb6bfCGyoX2g5t ShhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=xDzXIhrY26J6aExuOmYa/YdXWVTxEUbp715JZ1erNqk=; b=hFVXzO8cntIDbOCxZRlv1g1WFybgKxdWtsFOoVSdBxi3zSoASWuELNQkIPXJzg41eB /rYlrrYAtj8GbKOVaDES1MuIRnrOt8WC4EbUFU1vS6kAUIT7JpPKUoUCDUOF5mDM0pnO kUraCflynQrhmaRXOwCJnZleRyku+/yrg8rvTrA6WxeesF6d5oEG2Ut9ed+WvHdCAgDX kxeMdo+pB6gjrED17HC1ZaViXZ5q6czz6RH2+MJVxgd47H+JELR02LioIx23aO1zYLTB c8pCB6dI9qdrFt1+wEIegzaLg0FlOgwHwiEbPFCb1vqSjWWqbpGlrL/mrIisalOwT2rz 674w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=i8emC936; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=i0D8qzac; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d101si5200490wma.121.2018.03.31.19.40.10; Sat, 31 Mar 2018 19:40:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=i8emC936; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=i0D8qzac; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 652E4689C26; Sun, 1 Apr 2018 05:39:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDB7A68987F for ; Sun, 1 Apr 2018 05:39:33 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B1F3720A41 for ; Sat, 31 Mar 2018 22:39:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 31 Mar 2018 22:39:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=rMaJSjA1+jXXugH4m DxNwai28D9AIIrVZgDWk6wGQCk=; b=i8emC936paywMD41IPMVvKE2xSBnDTwrT F/3FO6n/no3HN6oMOJ8TLP8DEv9ElJIhNgmr3KePo2//nsxhueeQ1ArSXsc1A87G 2Ia1YW53+hFG/pCG3mOmjpeJICxfFMf+CPY+C0cEOamOAzykky/HSU5KWRvt/Pt2 YsUbkNouVLba061n26LhsExSeYP2hRDiH7F8ZyrSnMcU3fLSAb6SmscvakjU5K4G qph83nac36VCQqxj5seAosZUni9kPgtAFKDXdE/8Y4RO1Envm5sYe2IjpLZlzeZz 8393813xuaoNth9CbOKyWWJacSKU6io8XmgsafDi/j0DGxXn076JA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=rMaJSjA1+jXXugH4mDxNwai28D9AIIrVZgDWk6wGQCk=; b=i0D8qzac BWIM4J5eT/LRga9B7qXUyAF+cCT84pjQ8XBqtxDW++/3HTKL9mwLrrwZ8MsA+wNK 5m9AZq22FFIFNZDwaCs1VP15litG4B9eRrfIZD7T5EkDOfKiFq2kx+SIF4tW77IG fomzY6/WGJscIfZ43O2u9j0ZcPTzp26GwAKT/Rc9kr2A0ptvDYmUBNNWlEZz3te0 jyy/+gqpROn2sshTOvbDWR30MuFcKJrNkF2b7YTd6YS9riwQS5FHpwwLHfIQK0Fq xlI2qBf3oGWaKe7tqD8fdq+T4u76/Zw5ot9f9AoQWIpkcyQWxhoWm7P7HaQv5ENt CsQRu68pghJ6fg== X-ME-Sender: Received: from localhost.localdomain (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D2C810256 for ; Sat, 31 Mar 2018 22:39:52 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 03:39:41 +0100 Message-Id: <20180401023945.42053-2-josh@itanimul.li> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180401023945.42053-1-josh@itanimul.li> References: <20180401023945.42053-1-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH 2/6] lavf/img2dec: use new iteration 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Josh de Kock --- libavformat/img2dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index f3f52c83b3..5fda850e7d 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -323,7 +323,8 @@ int ff_img_read_header(AVFormatContext *s1) if (s1->pb) { int probe_buffer_size = 2048; uint8_t *probe_buffer = av_realloc(NULL, probe_buffer_size + AVPROBE_PADDING_SIZE); - AVInputFormat *fmt = NULL; + const AVInputFormat *fmt = NULL; + void *opaque = NULL; AVProbeData pd = { 0 }; if (!probe_buffer) @@ -340,7 +341,7 @@ int ff_img_read_header(AVFormatContext *s1) pd.buf_size = probe_buffer_size; pd.filename = s1->url; - while ((fmt = av_iformat_next(fmt))) { + while ((fmt = av_demuxer_iterate(&opaque))) { if (fmt->read_header != ff_img_read_header || !fmt->read_probe || (fmt->flags & AVFMT_NOFILE) ||