From patchwork Thu Jan 5 11:11:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 2061 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5281734vsb; Thu, 5 Jan 2017 03:18:36 -0800 (PST) X-Received: by 10.28.17.145 with SMTP id 139mr59088927wmr.50.1483615115994; Thu, 05 Jan 2017 03:18:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e134si81320606wmg.131.2017.01.05.03.18.35; Thu, 05 Jan 2017 03:18:35 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90C00689937; Thu, 5 Jan 2017 13:18:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56FC6680A9B for ; Thu, 5 Jan 2017 13:18:19 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id l2so70546923wml.2 for ; Thu, 05 Jan 2017 03:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dm/PzlCvWFkJ3bgpOb1dQMfU0wuVR+bQccwWMFHEPAk=; b=sKQgLEvHoLNq3h5LOSk39j0LjKPeG4wN0WWyNi5Rs2Z6uwpjFGOVyxbD6s3RVpm0Op mopT+677uDCfnJWv8gRepRl20+hssADjh9NERu+3989DLg0hi2zghIqScLaom4pXt8VO ZOTW05fglHnAiP7n8POA0xVtvQ9Z8HjdB5maXhHGDJ8wbNudYxCaru3wopAkq+QjTbyK gbQl9HUw94GDdhy0WhtNltdf9S5puBP2tQYzGib051EHBa2gMNdxnQixyknQdRw70Ip0 p7LXLiMOdh+uBxw+twvlY6XTxAHY1nnQzw2StHSfIyxJhuU3S/hiB+8/MCXnuqD/oief H6tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dm/PzlCvWFkJ3bgpOb1dQMfU0wuVR+bQccwWMFHEPAk=; b=KosPBBQBCq4RSzVLcg/obkQEPpYlmI8xhum1H+utBIo6mOXugHD/4AK60MLx7cWwsU X2UDxpmq3xRfzexatrrTMUF9YprnNWtUoTaHSuwThlBKsYLxih4Zbf7e682wCGt1JUTH lCfOllT5fuiRnxOe7I5BgP+QOvBj5oSSRm78yPHQ+JplRHQYrOUyQl+qBNospHfx/XIG V8ynIanytW5ZOkXXx2z6UBhHgfqfkQq+aZazbxZ2WQH155u8vxIVpJqGJhKjEGwCc4tp s2UZDrMllHUqs+IvHEiCamVpyO3SD8apPvgxXDlu9JMf/XLERyYiNVJWrHR7wys8HcdW xNzQ== X-Gm-Message-State: AIkVDXK6GSUYrVXJz5wwaoRUoeNfw9pluvk/sqXd5tDzhfb+phqtonBHZB3MOXqamiaI4g== X-Received: by 10.28.212.131 with SMTP id l125mr57513214wmg.117.1483614682206; Thu, 05 Jan 2017 03:11:22 -0800 (PST) Received: from boken.gopro.lcl (LPuteaux-656-1-74-135.w80-12.abo.wanadoo.fr. [80.12.80.135]) by smtp.gmail.com with ESMTPSA id j6sm103326617wjk.25.2017.01.05.03.11.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2017 03:11:21 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 12:11:35 +0100 Message-Id: <20170105111136.31854-5-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170105111136.31854-1-matthieu.bouron@gmail.com> References: <1462895161-21148-1-git-send-email-matthieu.bouron@gmail.com> <20170105111136.31854-1-matthieu.bouron@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] lavfi/framepool: cosmetic style fixes 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: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/framepool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 74235d4886..e1f1e2cc41 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -220,9 +220,8 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) break; frame->buf[i] = av_buffer_pool_get(pool->pools[i]); - if (!frame->buf[i]) { + if (!frame->buf[i]) goto fail; - } frame->data[i] = frame->buf[i]->data; } @@ -233,9 +232,8 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format; av_assert0(frame->data[1] != NULL); - if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) { + if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) goto fail; - } } frame->extended_data = frame->data;