[FFmpeg-cvslog] exr: reindent after previous commit
Andreas Cadhalpun
git at videolan.org
Sun Nov 27 01:30:13 EET 2016
ffmpeg | branch: release/3.1 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Wed Nov 16 20:47:35 2016 +0100| [cb936d62664c25909b320ec230b41b5a2b9c9ed3] | committer: Andreas Cadhalpun
exr: reindent after previous commit
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
(cherry picked from commit ce3147eb198770b558acf6c05f33cb807a413707)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb936d62664c25909b320ec230b41b5a2b9c9ed3
---
libavcodec/exr.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index f62b097..a811c02 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1418,14 +1418,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,
More information about the ffmpeg-cvslog
mailing list