diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 01:25:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 01:25:52 +0200 |
commit | 8d9fa738f5cdad19add6e49b11e9521e96634a4b (patch) | |
tree | 9bb5b86942217ced51d488af5fbf6fae1a4b5ca1 | |
parent | 0b42631641d998e509cde6fa344edc6ab5cb4ac8 (diff) | |
download | ffmpeg-8d9fa738f5cdad19add6e49b11e9521e96634a4b.tar.gz |
j2kdec: cosmetics from jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/j2kdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index bb1aa9bfba..893fcd0fef 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -211,9 +211,9 @@ static int get_siz(Jpeg2000DecoderContext *s) if (bytestream2_get_bytes_left(&s->g) < 36) return AVERROR(EINVAL); - bytestream2_get_be16u(&s->g); // Rsiz (skipped) - s->width = bytestream2_get_be32u(&s->g); // width - s->height = bytestream2_get_be32u(&s->g); // height + bytestream2_get_be16u(&s->g); // Rsiz + 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 @@ -927,7 +927,7 @@ static int decode_codestream(Jpeg2000DecoderContext *s) for (;;){ int oldpos, marker, len, ret = 0; - if (bytestream2_get_bytes_left(&s->g) < 2){ + if (bytestream2_get_bytes_left(&s->g) < 2) { av_log(s->avctx, AV_LOG_ERROR, "Missing EOC\n"); break; } |