From patchwork Wed Nov 16 19:57:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1448 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp382507vsb; Wed, 16 Nov 2016 12:14:07 -0800 (PST) X-Received: by 10.194.149.143 with SMTP id ua15mr3918350wjb.48.1479327246992; Wed, 16 Nov 2016 12:14:06 -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 c1si34791145wjn.227.2016.11.16.12.14.06; Wed, 16 Nov 2016 12:14:06 -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=@googlemail.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=QUARANTINE dis=QUARANTINE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AC60689D74; Wed, 16 Nov 2016 22:14:03 +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 95006689C54 for ; Wed, 16 Nov 2016 22:13:57 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id g23so14793438wme.1 for ; Wed, 16 Nov 2016 12:13:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=8wkclhNUgy6PmlN5Rd8BLGYacV86E4Rtfyeu50pagvU=; b=eswK2QdBIPVEABGdJ2rZ/IxPYTOuWxsi86t68rzx4YFH6TF/5oecLoEyjmlYVhcjPW 6GDknkNs6rMptaIZbPjx5u8CcU9+TjNTHPDyrnXHu6eWdx4yP5d9HEIGYZZhuSqURSH5 2Y39oMEmvPD6uHYap53MWw3uF4EChViWsWPb5ZSEpOYGBdOd+ih1XI4oWcpaaZgP7aNi 20XPng/pfTj9I79yVNpi0lpo3G544fL+U2RcHSValp6BNCWDSy3vRu7zl8RouivyjZ0D q03yrNudMxm9uOdyTFBGyoRrCS18sfX9dMIgNr56So/neUjGsYeTNGXaq40P1K/82qEH N8mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=8wkclhNUgy6PmlN5Rd8BLGYacV86E4Rtfyeu50pagvU=; b=WEJjcBSs+spdrkI/1D3TNwhzZZW1cJhyVIulgDL8kmlKP+jT7XBYGgj88HMWfdsPT/ f0Kk8mjNn/gtmgqeJLBE9B4mVCSzSpFueYXEO7+T4JmH7DfsrugjT7u5m/GC/fhD+2tE 8NkpuXwCyuOSsbvX/7XtFbydV2c3L1OKZu/6LHrwFNynQeYUKCU1C3P9msPDpFQO3XON 2MxcOxNvilQI3NlCLW9DCfyQq8OeaS1w5dYxkWTFeIYrNUx++vsLlzgfITzJkvrfUHOg oTj/UloJXAfw/LB9LKV3j1DQB6oACSeDO3qdxBxptjU5tmnlKWvV4zAMxgsFXdmOMfG/ qhKQ== X-Gm-Message-State: ABUngvdcT0N/Apt+eedjiEeO1AEJSEQ8WVtLDGhT7dQTA/AjUFIskQdwGGLkXXj+aQa4aw== X-Received: by 10.194.127.104 with SMTP id nf8mr3162463wjb.39.1479326243358; Wed, 16 Nov 2016 11:57:23 -0800 (PST) Received: from [192.168.2.21] (p5B072246.dip0.t-ipconnect.de. [91.7.34.70]) by smtp.googlemail.com with ESMTPSA id e188sm11817661wma.21.2016.11.16.11.57.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 11:57:22 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <8088a842-01e8-1efb-90fc-febaa4b34ae6@googlemail.com> Message-ID: Date: Wed, 16 Nov 2016 20:57:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <8088a842-01e8-1efb-90fc-febaa4b34ae6@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/3] exr: reindent 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: Paul B Mahol , Martin Vignali Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Cadhalpun --- libavcodec/exr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index bff08f2..35e07d4 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1431,14 +1431,14 @@ static int decode_header(EXRContext *s) } if (channel_index >= 0 && s->channel_offsets[channel_index] == -1) { /* channel has not been previously assigned */ - if (s->pixel_type != EXR_UNKNOWN && - s->pixel_type != current_pixel_type) { - av_log(s->avctx, AV_LOG_ERROR, - "RGB channels not of the same depth.\n"); - return AVERROR_INVALIDDATA; - } - s->pixel_type = current_pixel_type; - s->channel_offsets[channel_index] = s->current_channel_offset; + if (s->pixel_type != EXR_UNKNOWN && + s->pixel_type != current_pixel_type) { + av_log(s->avctx, AV_LOG_ERROR, + "RGB channels not of the same depth.\n"); + return AVERROR_INVALIDDATA; + } + s->pixel_type = current_pixel_type; + s->channel_offsets[channel_index] = s->current_channel_offset; } s->channels = av_realloc(s->channels,