aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-26 18:47:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-26 20:15:50 +0200
commit726eac1df96fcd5f10f3621188adc39b32646683 (patch)
treed0d7568513a13327855b007fcef06f7ebdcb29cc
parent88d2dd00fe0cd0c0d3863cfa50ec82b740d8e2a9 (diff)
downloadffmpeg-726eac1df96fcd5f10f3621188adc39b32646683.tar.gz
j2kdec: cosmetics from jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/j2kdec.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index b4d30fd082..6ada6433c9 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
@@ -137,7 +137,7 @@ static int tag_tree_decode(Jpeg2000DecoderContext *s, Jpeg2000TgtNode *node, int
}
/* marker segments */
-/** get sizes and offsets of image, tiles; number of components */
+/* get sizes and offsets of image, tiles; number of components */
static int get_siz(Jpeg2000DecoderContext *s)
{
int i, ret;
@@ -147,16 +147,15 @@ static int get_siz(Jpeg2000DecoderContext *s)
return AVERROR(EINVAL);
bytestream2_get_be16u(&s->g); // Rsiz
- s->width = bytestream2_get_be32u(&s->g); // Width
- s->height = bytestream2_get_be32u(&s->g); // Height
+ s->width = bytestream2_get_be32u(&s->g); // Width
+ s->height = bytestream2_get_be32u(&s->g); // Height
s->image_offset_x = bytestream2_get_be32u(&s->g); // X0Siz
s->image_offset_y = bytestream2_get_be32u(&s->g); // Y0Siz
-
- s->tile_width = bytestream2_get_be32u(&s->g); // XTSiz
- s->tile_height = bytestream2_get_be32u(&s->g); // YTSiz
- s->tile_offset_x = bytestream2_get_be32u(&s->g); // XT0Siz
- s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz
- s->ncomponents = bytestream2_get_be16u(&s->g); // CSiz
+ s->tile_width = bytestream2_get_be32u(&s->g); // XTSiz
+ s->tile_height = bytestream2_get_be32u(&s->g); // YTSiz
+ s->tile_offset_x = bytestream2_get_be32u(&s->g); // XT0Siz
+ s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz
+ s->ncomponents = bytestream2_get_be16u(&s->g); // CSiz
if (s->ncomponents <= 0 || s->ncomponents > 4) {
av_log(s->avctx, AV_LOG_ERROR, "unsupported/invalid ncomponents: %d\n", s->ncomponents);