RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

j2kdec: cosmetics from jpeg2000dec 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-22 01:25:52 +02:00
parent 0b42631641
commit 8d9fa738f5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/j2kdec.c
View File

@ -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;
}