[FFmpeg-cvslog] j2kdec: cosmetics from jpeg2000dec
Michael Niedermayer
git at videolan.org
Wed May 22 01:34:57 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 22 01:25:52 2013 +0200| [8d9fa738f5cdad19add6e49b11e9521e96634a4b] | committer: Michael Niedermayer
j2kdec: cosmetics from jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d9fa738f5cdad19add6e49b11e9521e96634a4b
---
libavcodec/j2kdec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index bb1aa9b..893fcd0 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;
}
More information about the ffmpeg-cvslog
mailing list