From 2c3901b2c34b5e1f556d0e19c4cc218fdcbec695 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 1 Jul 2013 10:01:13 +0200 Subject: jpeg2000: Remove unneeded returns Signed-off-by: Luca Barbato --- libavcodec/jpeg2000dec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'libavcodec/jpeg2000dec.c') 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, -- cgit v1.2.1