RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jpeg2000: Remove unneeded returns 

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer 2013-07-01 10:01:13 +02:00 committed by Luca Barbato
parent ef35d6dbc6
commit 2c3901b2c3
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/jpeg2000.c
View File

@ -115,7 +115,6 @@ static int getsigctxno(int flag, int bandno)
return 2; return 2;
if (d == 1) if (d == 1)
return 1; return 1;
return 0;
} else { } else {
if (d >= 3) if (d >= 3)
return 8; return 8;
@ -135,7 +134,6 @@ static int getsigctxno(int flag, int bandno)
return 2; return 2;
if (h + v == 1) if (h + v == 1)
return 1; return 1;
return 0;
} }
return 0; return 0;
} }

6
libavcodec/jpeg2000dec.c
View File

@ -992,7 +992,6 @@ static void dequantization_float(int x, int y, Jpeg2000Cblk *cblk,
idx = (comp->coord[0][1] - comp->coord[0][0]) * j + i; idx = (comp->coord[0][1] - comp->coord[0][0]) * j + i;
datap[idx] = (float)(t1->data[j][i]) * ((float)band->stepsize); datap[idx] = (float)(t1->data[j][i]) * ((float)band->stepsize);
} }
return;
} }
/* Integer dequantization of a codeblock.*/ /* Integer dequantization of a codeblock.*/
@ -1009,7 +1008,6 @@ static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk,
datap[idx] = datap[idx] =
((int32_t)(t1->data[j][i]) * ((int32_t)band->stepsize) + (1 << 15)) >> 16; ((int32_t)(t1->data[j][i]) * ((int32_t)band->stepsize) + (1 << 15)) >> 16;
} }
return;
} }
/* Inverse ICT parameters in float and integer. /* Inverse ICT parameters in float and integer.
@ -1027,10 +1025,9 @@ static const int i_ict_params[4] = {
116130 116130
}; };
static int mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) static void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
{ {
int i, csize = 1; int i, csize = 1;
int ret = 0;
int32_t *src[3], i0, i1, i2; int32_t *src[3], i0, i1, i2;
float *srcf[3], i0f, i1f, i2f; float *srcf[3], i0f, i1f, i2f;
@ -1076,7 +1073,6 @@ static int mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
} }
break; break;
} }
return ret;
} }
static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,