From: Michael Niedermayer <[email protected]>
---
libavcodec/jpeg2k.c | 2 --
libavcodec/jpeg2kdec.c | 6 +-----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/libavcodec/jpeg2k.c b/libavcodec/jpeg2k.c
index 4ce121a..e8f5ff0 100644
--- a/libavcodec/jpeg2k.c
+++ b/libavcodec/jpeg2k.c
@@ -115,7 +115,6 @@ static int getsigctxno(int flag, int bandno)
return 2;
if (d == 1)
return 1;
- return 0;
} else {
if (d >= 3)
return 8;
@@ -135,7 +134,6 @@ static int getsigctxno(int flag, int bandno)
return 2;
if (h + v == 1)
return 1;
- return 0;
}
return 0;
}
diff --git a/libavcodec/jpeg2kdec.c b/libavcodec/jpeg2kdec.c
index a80110d..e0fa798 100644
--- a/libavcodec/jpeg2kdec.c
+++ b/libavcodec/jpeg2kdec.c
@@ -992,7 +992,6 @@ static void dequantization_float(int x, int y, Jpeg2KCblk
*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, Jpeg2KCblk
*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(Jpeg2KDecoderContext *s, Jpeg2KTile *tile)
+static void mct_decode(Jpeg2KDecoderContext *s, Jpeg2KTile *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(Jpeg2KDecoderContext *s, Jpeg2KTile
*tile)
}
break;
}
- return ret;
}
static int jpeg2k_decode_tile(Jpeg2KDecoderContext *s, Jpeg2KTile *tile,
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
