From patchwork Wed Jan 10 11:18:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rn_Heusipp?= X-Patchwork-Id: 7248 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp5052752jaa; Wed, 10 Jan 2018 03:18:58 -0800 (PST) X-Google-Smtp-Source: ACJfBou8cj42KY6t+fGv1BBaukBbwHn3WPt+5t0jwDmPSaVpYEgLfTiy4WAKEloBnDRcn1AcgLwP X-Received: by 10.223.192.134 with SMTP id d6mr12504987wrf.206.1515583138754; Wed, 10 Jan 2018 03:18:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515583138; cv=none; d=google.com; s=arc-20160816; b=TbuLZmL6bKLBjW/VrLpw2LK8hGlsBKQpP5vU77bGUsddzI3+UjiY9y0yPs+q4bMzSG 5h5T1D4ZCKOZYnux+lCaW20u7icq/M80p7u7i3PTxSp27XO58rWx0V4/idmRdq5RhCRn 5pliE6hwgU3kuwm8nm7QgkgF5p0KTtCB2Wd6GP3fVQ6xNmshvL8GFss2dqHKe8VQrtv6 tB/060Hdb/mxjQmmLrJ7x0EkSluCjczqg66B0ICGfMXNgIL8uZfI48Nsy5KLQWsoWOVi sUcWs1JjYzusvhTLLh5e55xIz/oQ2OAgOdPQnqhxhv48+1Kjhn69mshx7nAgp8SBFWvD VCDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=JPZXdOcSU27OU/Nrp/p8eRp6syjmHwQ51f3YKVTtGuE=; b=rTjYhmBFSIWe2by8mlBdJ1DFux3ErfgjVjeesTG6w9JWVQVn0wVvabPsVPiDeLSB1e jV3VwPE7T4OjnvSMkAF1x7wIFg2DFXelVV03BRA5ZTfIzlK/Wfw7NiFTQ7+H7VMapmYq vjxm2mUCgY1nLfiROdHC5NvQIyXVYhb4ATnmioet5hImiUdXHW9MCTLAH3fRmos3NKW0 wQYVyaAoeen85dUnNGr9do1k9VWV+47apHKHv/HXcX1Wz+w1qANMsamhohke96ynZ2se +ThJfgrM20mWCNumuLV6uAnZc/hI4BIwHoZmU4EtuCPBKCYTYAwWws9xwnJMs3EdX7r3 r2AQ== ARC-Authentication-Results: i=1; mx.google.com; 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 m20si12394840wrf.516.2018.01.10.03.18.57; Wed, 10 Jan 2018 03:18:58 -0800 (PST) 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; 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 28AAD689D7E; Wed, 10 Jan 2018 13:18:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from datengang.de (datengang.de [138.201.179.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74BD0689820 for ; Wed, 10 Jan 2018 13:18:48 +0200 (EET) Received: from p5b3e6755.dip0.t-ipconnect.de ([91.62.103.85] helo=idefix.fritz.box) by datengang.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.89) (envelope-from ) id 1eZEOT-0001nt-Lk; Wed, 10 Jan 2018 12:18:06 +0100 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Jan 2018 12:18:01 +0100 Message-Id: <1515583084-6466-2-git-send-email-osmanx@problemloesungsmaschine.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515583084-6466-1-git-send-email-osmanx@problemloesungsmaschine.de> References: <1515233228-16796-1-git-send-email-osmanx@problemloesungsmaschine.de> <1515583084-6466-1-git-send-email-osmanx@problemloesungsmaschine.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.62.103.85 X-SA-Exim-Mail-From: osmanx@problemloesungsmaschine.de X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on datengang.de X-Spam-Level: X-Spam-Status: No, score=-2.9 required=8.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on datengang.de) Subject: [FFmpeg-devel] [PATCH v2 1/4] avformat/libopenmpt: Fix mixed code and declarations 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: Jörn Heusipp --- libavformat/libopenmpt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index af6eb1a..2e22290 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -72,13 +72,14 @@ static int read_header_openmpt(AVFormatContext *s) { AVStream *st; OpenMPTContext *openmpt = s->priv_data; - int64_t size = avio_size(s->pb); - if (size <= 0) - return AVERROR_INVALIDDATA; - char *buf = av_malloc(size); + int64_t size; + char *buf; int ret; - + size = avio_size(s->pb); + if (size <= 0) + return AVERROR_INVALIDDATA; + buf = av_malloc(size); if (!buf) return AVERROR(ENOMEM); size = avio_read(s->pb, buf, size);