From patchwork Mon Feb 13 18:09:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 40385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3677179pzk; Mon, 13 Feb 2023 10:10:43 -0800 (PST) X-Google-Smtp-Source: AK7set8Qk82sRj+DrIGvmBu01anJ8lMtuPFwjq/B1isxOZGLhH9BonPfGsqmYi76wkEH5PRJtETw X-Received: by 2002:a50:ce4d:0:b0:4ab:ed5:dd46 with SMTP id k13-20020a50ce4d000000b004ab0ed5dd46mr18608206edj.6.1676311843293; Mon, 13 Feb 2023 10:10:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676311843; cv=none; d=google.com; s=arc-20160816; b=OEU9IMjiDHIw/zWLn3lxOcGEj1DHoGnc01Ik1PubSrrA3UmD+UelJL6h3YtKojlIDw k0mxEk0YWebZpFdenmxDEmPRYGrvMBcMBID6MKfAFXKRwhm54522FMk5UeHkr+QWLDPt ACMLHANjACC7FXfRrGPOeT3J/D9sb8R/ZGj1bPA+wzZwz9YFEzLISiwX89LOatFeErq2 NXAlryBC9G4Hkt+Ft2GjLOKdIe2GuIYenoGlcLy+g04tJLpgTHUz9pJ0YxxA8PHD9M4y s6IvSXMbARAOSwX9HX4WyOyqZWNnpEAEeRH3b7qJhTdOoDrsRLoaKuMPrNkSEErTeXc1 liRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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; bh=lw6EAvrmJl4Dkd99hyYWVzewvrM4jsyShbLlToomrqY=; b=YnP5hCIpvVU65i3KvTXGaZUerN8+dmnC9KR1dMRuGuSZRy2H0LiBDNuvZ06YNLV6Hx 0hP70yy18/A3mPzM96FIwkUxW1GBY7oMa2QFHECHTR8VHeatl0KaZtH8bXa6P8Bstwo4 LYGoQsibXSEVpKFY86Q8uDtpCol6F/u6/hu01W+1KC50Wn7dDl+EG3+S5c24XP5jVKzF cLPmYu9/mlCg/pMkeI6cM2liv4x/v1pLxup/+t11Xya+jO0Is5mpK5d4ZYkwzJbQUdQy P4yritDkQruaX2ytFriLbSYmvQdsvmnuwXjbc+6ZuvXju9DFb7vjiYVqOoTSMjZ0sqLO KHHw== 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 d21-20020a50fb15000000b004ac4a74102bsi9517488edq.332.2023.02.13.10.10.42; Mon, 13 Feb 2023 10:10:43 -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 470A168BA04; Mon, 13 Feb 2023 20:09:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-2.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AB9F68BE7E for ; Mon, 13 Feb 2023 20:09:50 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id EABC042D5F; Mon, 13 Feb 2023 18:09:44 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Feb 2023 19:09:35 +0100 Message-Id: <20230213180936.815-6-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.39.1.windows.1 In-Reply-To: <20230213180936.815-1-nicolas.gaullier@cji.paris> References: <20230213180936.815-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/wavdec.c: Reindent after last commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HAEnwvUhcqTp --- libavformat/wavdec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index fd9ca89880..29192e48f0 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -793,14 +793,14 @@ smv_out: size = FFMIN(S337M_MAX_OFFSET, left); ret = ff_s337m_get_packet(s->pb, pkt, size, NULL, s, st->codecpar->bits_per_coded_sample); } else { - size = wav->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 = wav->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); } if (ret < 0)