generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/exr: Fix mixed declarations and statements

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-07-07 14:41:05 +02:00
parent 50747d6b1f
commit b450b82514
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/exr.c
View File

@ -1195,8 +1195,9 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
} else { } else {
for (x = 0; x < td->xsize; x++) { for (x = 0; x < td->xsize; x++) {
union av_intfloat32 t; union av_intfloat32 t;
int c;
for (int c = 0; c < rgb_channel_count; c++) { for (c = 0; c < rgb_channel_count; c++) {
t.i = bytestream_get_le32(&rgb[c]); t.i = bytestream_get_le32(&rgb[c]);
if (t.f > 0.0f) /* avoid negative values */ if (t.f > 0.0f) /* avoid negative values */
t.f = powf(t.f, one_gamma); t.f = powf(t.f, one_gamma);
@ -1210,7 +1211,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
} else { } else {
// 16-bit // 16-bit
for (x = 0; x < td->xsize; x++) { for (x = 0; x < td->xsize; x++) {
for (int c = 0; c < rgb_channel_count; c++) { int c;
for (c = 0; c < rgb_channel_count; c++) {
*ptr_x++ = s->gamma_table[bytestream_get_le16(&rgb[c])]; *ptr_x++ = s->gamma_table[bytestream_get_le16(&rgb[c])];
} }