diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 10:01:13 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-02 20:05:45 +0200 |
| commit | 2c3901b2c34b5e1f556d0e19c4cc218fdcbec695 (patch) | |
| tree | e2795823899a9f7c61dc7eb0c78216cb0e8e04a8 /libavcodec/jpeg2000dec.c | |
| parent | ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f (diff) | |
| download | ffmpeg-2c3901b2c34b5e1f556d0e19c4cc218fdcbec695.tar.gz | |
jpeg2000: Remove unneeded returns
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 86ccad0881..1b40912152 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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; datap[idx] = (float)(t1->data[j][i]) * ((float)band->stepsize); } - return; } /* Integer dequantization of a codeblock.*/ @@ -1009,7 +1008,6 @@ static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk, datap[idx] = ((int32_t)(t1->data[j][i]) * ((int32_t)band->stepsize) + (1 << 15)) >> 16; } - return; } /* Inverse ICT parameters in float and integer. @@ -1027,10 +1025,9 @@ static const int i_ict_params[4] = { 116130 }; -static int mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) +static void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) { int i, csize = 1; - int ret = 0; int32_t *src[3], i0, i1, i2; float *srcf[3], i0f, i1f, i2f; @@ -1076,7 +1073,6 @@ static int mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) } break; } - return ret; } static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, |