From patchwork Tue Aug 6 15:08:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaullier Nicolas X-Patchwork-Id: 14272 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 EA822447AC7 for ; Tue, 6 Aug 2019 18:08:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D153B68AAAA; Tue, 6 Aug 2019 18:08:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F42E68A93C for ; Tue, 6 Aug 2019 18:08:18 +0300 (EEST) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 462ygj5HqDzHh9D; Tue, 6 Aug 2019 15:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arkena.com; s=20150421; t=1565104097; bh=fEx043V24kl7QQ3L0DJXYMs88L5gW4Qysbh/SwbWqfo=; h=From:To:Cc:Subject:Date:Message-Id; b=vHM5CtTmwDcuOalIGGfIfeg/0k3g5XpJ1S7sRFZX0Aq8ch2ETwVCfOAKkYqFUVmvh 4pB5bfZGZ3ie9E6uaYHIu24YBYc5mB3mlOhRJf6OVJC0GUOaaE+MryybCy6AJPK6Yc oUxCbn9VtQP9qhZJ309lvjMU4B+K6I9uVazvLqf8= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 968C43FA71; Tue, 6 Aug 2019 16:45:28 +0200 (CEST) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Aug 2019 17:08:14 +0200 Message-Id: <20190806150814.5676-4-nicolas.gaullier@arkena.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20190806150814.5676-1-nicolas.gaullier@arkena.com> References: <20190806150814.5676-1-nicolas.gaullier@arkena.com> Subject: [FFmpeg-devel] [PATCH v3 5/6] avformat/wavdec: reindent 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: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/wavdec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 2ef2d9e549..b9a782bec5 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -712,14 +712,14 @@ smv_out: } if (!CONFIG_S337M_DEMUXER || st->codecpar->codec_id != AV_CODEC_ID_DOLBY_E) { - size = MAX_SIZE; - if (st->codecpar->block_align > 1) { - if (size < st->codecpar->block_align) - size = st->codecpar->block_align; - size = (size / st->codecpar->block_align) * st->codecpar->block_align; - } - size = FFMIN(size, left); - ret = av_get_packet(s->pb, pkt, size); + size = MAX_SIZE; + if (st->codecpar->block_align > 1) { + if (size < st->codecpar->block_align) + size = st->codecpar->block_align; + size = (size / st->codecpar->block_align) * st->codecpar->block_align; + } + size = FFMIN(size, left); + ret = av_get_packet(s->pb, pkt, size); } else { size = FFMIN(AVPRIV_S337M_MAX_RECOMMENDED_PROBE_SIZE, left); ret = avpriv_s337m_get_packet((void *)s, s->pb, pkt, size, 0);