har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

j2kdec: s/j2k_/jpeg2000_/

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-30 16:54:09 +02:00
parent 4a85390d29
commit 7836583934
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/j2kdec.c
View File

@ -101,7 +101,7 @@ static int get_bits(Jpeg2000DecoderContext *s, int n)
return res; return res;
} }
static void j2k_flush(Jpeg2000DecoderContext *s) static void jpeg2000_flush(Jpeg2000DecoderContext *s)
{ {
if (bytestream2_get_byte(&s->g) == 0xff) if (bytestream2_get_byte(&s->g) == 0xff)
bytestream2_skip(&s->g, 1); bytestream2_skip(&s->g, 1);
@ -560,7 +560,7 @@ static int decode_packet(Jpeg2000DecoderContext *s,
int bandno, cblkno, ret, nb_code_blocks; int bandno, cblkno, ret, nb_code_blocks;
if (!(ret = get_bits(s, 1))) { if (!(ret = get_bits(s, 1))) {
j2k_flush(s); jpeg2000_flush(s);
return 0; return 0;
} else if (ret < 0) } else if (ret < 0)
return ret; return ret;
@ -603,7 +603,7 @@ static int decode_packet(Jpeg2000DecoderContext *s,
cblk->npasses += newpasses; cblk->npasses += newpasses;
} }
} }
j2k_flush(s); jpeg2000_flush(s);
if (codsty->csty & JPEG2000_CSTY_EPH) { if (codsty->csty & JPEG2000_CSTY_EPH) {
if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH) if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH)