From patchwork Sun Apr 1 02:39:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 8269 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1182205jad; Sat, 31 Mar 2018 19:40:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx49bu9iAD3xdrVVvs3vQSj2NNY1BT2Fb9NMbHqLxS/bO8fcOKRx/9UrwcDQ5BTdasORrU+cJ X-Received: by 10.223.173.207 with SMTP id w73mr3304853wrc.234.1522550444525; Sat, 31 Mar 2018 19:40:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522550444; cv=none; d=google.com; s=arc-20160816; b=pggolP388dVqMk52RJlIo19N4yXX4WjmkwhNGBXLghW4+ob2R+1RPYkWZT3ndVQtHd 4k3CIjdhsilRiw+M22ma+nuJ41CRHCfJLPt/9FYhhRsBzCF/OV8sTyqcXgMWVYRzFcrI pmRTP7ZBojM3KUnWBeHTvC29I2xaBNgZgkgVEdpwjYZUII3F6BMEGLaXRQm5x3TMKIN2 PvTgjlRTd6kG/inihlO1U5HfO98CHF8tf/Itqc9w2FNCERBEvMAB2W795+tVGet0Vavg sSqh0pKH6JXVL3zEdXCW9quwrMjABpRI1jgwy6fmphkxVV4WTkrpTBo/Dx3zJLT9NMjG mS+w== 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=/Ci/U/JBmp3fCEzwJl1GcdL2St0XzHQ+fsGPF5kOQUQ=; b=Aq9HE/6TkagVBBCD4d/Tbq7U1Z1UVcFL9OTVX2FY+IsvUrl4unK6YFi6GwKagsu38K 8Z+O7GHwWzs7pCV9I3U5I1KMgfXarXqzwmo8jQYgEpRdQv9BHlSV+x8TVJHAvtkvlL8z OIidCDQnVGgNkk2SEC4FfJ85AuxFUKiJ5nwpNhnj/7P5GCB9QKn7I2iXDp1e6v3voboX cR+Wdz0OxNSsIfgqFC8K3/gWqEZHHM3B+amldD7jMlBH+GjaIcL15BOG+k1IgiXL48Et tPsmShs4WfIu777NrsiJVOpvGSXMPDYeChmxdpcGOfBqROO0f6rJd0y9mXCSjpdmqU6T Qgqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=M3820KbH; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=l8NqySTN; 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 70si5399397wmb.75.2018.03.31.19.40.44; Sat, 31 Mar 2018 19:40:44 -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=M3820KbH; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=l8NqySTN; 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 8EC38689C5B; Sun, 1 Apr 2018 05:39:46 +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 D216D689CB4 for ; Sun, 1 Apr 2018 05:39:39 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 6566B20CB0 for ; Sat, 31 Mar 2018 22:39:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 31 Mar 2018 22:39:55 -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=9Nn0VcqzWeqpx0qFs m3mq7TqzU/NrG24v9UYnJekL/o=; b=M3820KbHDXy+qK4q8lBorHoFL30GEvJkh TWA+TdFdN8k5xPS4DYiCZXctsecOtcCZSafEnPv+uGnYlmb0cHoLdfSdx3wfXMRQ E2q33an5C3Y1QincQD7ynEdSR1pEoqc2pQ8paaqm1m57mResJ3hn8Hi1zihx7ygC R6IA5O6JX0qHRXO9behr9nWtYPt3oWUvkLr4bdIEUuYJBi5htUCVG+cV13nhVrR4 2fsWjnorICrhMmYaXrDQFLXZLQiyGYD5IjZ+zXqhUMK8ogLnsDnV+Hk+wk/j69AO X4rakLJsREuy+2oOihNI+V6BdWj274Z+wFzdv4QkTFykNCGEvsc2A== 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=9Nn0VcqzWeqpx0qFsm3mq7TqzU/NrG24v9UYnJekL/o=; b=l8NqySTN 2r1mHULp5Jy6jlpkvA15o0Xps5hnJGLr4BDQZiOjdBP5z3/FHVHy6OzuWwdZi3KY 0PKR3tKCumnRlswQpVk3LN1I9pGmPHjclmodUzrYzedSIyl6x7ScC698GVRfGCme UO5IVZrgv7V4cdG4na33s949cEyAp3SzuJpdWwQ98Sgkg2MwVxYLn+hcUWZYyCkp uspbCuRv1SskpaXMIP2xXZKTZcDOlA2173JfxnCkGfvXVpeXSIgzNE8f+QccDcC+ 4nUL/9mXX9lcBXjHg6K8rkggycobm8RQjHeCCxOCihLzt3bpZB4ZWLk3QaHTcdHd r1oheAjUdHJJHA== 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 E6BC510251 for ; Sat, 31 Mar 2018 22:39:54 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 03:39:45 +0100 Message-Id: <20180401023945.42053-6-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 6/6] lavf/format: use const AVInputFormat for iteration 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/format.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/format.c b/libavformat/format.c index 1b2ce22e25..1c66afb7e6 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -117,11 +117,11 @@ enum AVCodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, AVInputFormat *av_find_input_format(const char *short_name) { - AVInputFormat *fmt = NULL; + const AVInputFormat *fmt = NULL; void *i = 0; while ((fmt = av_demuxer_iterate(&i))) if (av_match_name(short_name, fmt->name)) - return fmt; + return (AVInputFormat*)fmt; return NULL; } @@ -129,7 +129,8 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret) { AVProbeData lpd = *pd; - AVInputFormat *fmt1 = NULL, *fmt; + const AVInputFormat *fmt1 = NULL; + AVInputFormat *fmt = NULL; int score, score_max = 0; void *i = 0; const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE]; @@ -156,7 +157,6 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, nodat = ID3_GREATER_PROBE; } - fmt = NULL; while ((fmt1 = av_demuxer_iterate(&i))) { if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) && strcmp(fmt1->name, "image2")) continue; @@ -191,7 +191,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, } if (score > score_max) { score_max = score; - fmt = fmt1; + fmt = (AVInputFormat*)fmt1; } else if (score == score_max) fmt = NULL; }