From patchwork Thu Jan 5 11:11:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 2062 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5281810vsb; Thu, 5 Jan 2017 03:18:46 -0800 (PST) X-Received: by 10.28.16.70 with SMTP id 67mr57068686wmq.53.1483615126549; Thu, 05 Jan 2017 03:18:46 -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 f19si5914583wmf.101.2017.01.05.03.18.46; Thu, 05 Jan 2017 03:18:46 -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 0CDB06891F7; Thu, 5 Jan 2017 13:18:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E83B1689A72 for ; Thu, 5 Jan 2017 13:18:30 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id c85so57632654wmi.1 for ; Thu, 05 Jan 2017 03:18:36 -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=gPqxXxhclKkUEpYe1jSGu+C5PSrkBytyeKQwDEiQTUo=; b=oRyr7Dq6G+/H9OXNxQHRTE2bjQcWCCfLnap++aiVjPE/3erjouLawoUs7EJuk1IRB4 S/xN0EJ8A+z9h2iVrYu+DV7w42G0NLejlnjwanWPzph0cPofAsfo8K7486YYv4xBNbKE x3uybndUrxRSJJwmH4oDT8JimpRDSJ95wKeHRXNW68CDx5QgZFmt2d0iDyKy+zmWnXIf uXNekj053d9rc8TOa0YJ7mlgPhrhpe81vyYlsfIhitpkGDkjknNVMHGl+Idjhefrce0G 3+iGSmQwvVe5wZpZSF8Q9aGu3blLC+t0cgFBsEqDK7ujZn6q6w6InqVfCcmUlmgrfnQd gkgA== 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=gPqxXxhclKkUEpYe1jSGu+C5PSrkBytyeKQwDEiQTUo=; b=fc+ASJM2GpYiPDX30ZAB/9TIhf7XuHnYhB0mT9555OhWG8w9tUXVFXoZ2rr4IfCZlN FNQU8O07eKUfBJLjSnkOqkbySVybp2AVNfR/6HqCXhXJuE8xdP0y8NEAJFoaityMbuWz m1Y5Kew5Zl03ltmTE3tZY+DgwklHTlWx6ukfNPK8CX+6N9ZImZhPBDeQMwH9V2S+Ufzh 1B1rIkkex4omDSnocKZiCbDIFNIlHe7kiPtE7HRsz4kyl/OQL4ltSe9ipK2jrSmxboyh aYxkYqY0sU1XXxe90twGJJU+FERIscODG1lmZw41V5HH0m1j33tbuY2M2FrMwv4bIGQ2 73Fg== X-Gm-Message-State: AIkVDXKZuIiDgCQfxBFmUWlEswIamgtLD9acMVXtBUGEZt13MF/tk7Y2MemaqfgqCJGSiA== X-Received: by 10.28.17.20 with SMTP id 20mr56513699wmr.99.1483614681387; Thu, 05 Jan 2017 03:11:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2017 03:11:20 -0800 (PST) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 12:11:34 +0100 Message-Id: <20170105111136.31854-4-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 3/5] lavfi/framepool: re-indent after previous commit 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 | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 588dcb6da2..74235d4886 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -205,41 +205,41 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) switch(pool->type) { case AVMEDIA_TYPE_VIDEO: - desc = av_pix_fmt_desc_get(pool->format); - if (!desc) { - goto fail; - } + desc = av_pix_fmt_desc_get(pool->format); + if (!desc) { + goto fail; + } - frame->width = pool->width; - frame->height = pool->height; - frame->format = pool->format; + frame->width = pool->width; + frame->height = pool->height; + frame->format = pool->format; - for (i = 0; i < 4; i++) { - frame->linesize[i] = pool->linesize[i]; - if (!pool->pools[i]) - break; + for (i = 0; i < 4; i++) { + frame->linesize[i] = pool->linesize[i]; + if (!pool->pools[i]) + break; - frame->buf[i] = av_buffer_pool_get(pool->pools[i]); - if (!frame->buf[i]) { - goto fail; - } + frame->buf[i] = av_buffer_pool_get(pool->pools[i]); + if (!frame->buf[i]) { + goto fail; + } - frame->data[i] = frame->buf[i]->data; - } + frame->data[i] = frame->buf[i]->data; + } - if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { - enum AVPixelFormat format = - pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format; + if (desc->flags & AV_PIX_FMT_FLAG_PAL || + desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) { + enum AVPixelFormat format = + 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) { - goto fail; + av_assert0(frame->data[1] != NULL); + if (avpriv_set_systematic_pal2((uint32_t *)frame->data[1], format) < 0) { + goto fail; + } } - } - frame->extended_data = frame->data; - break; + frame->extended_data = frame->data; + break; case AVMEDIA_TYPE_AUDIO: frame->nb_samples = pool->nb_samples; av_frame_set_channels(frame, pool->channels);