diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 16:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 18:31:25 +0200 |
| commit | 7836583934060d31fe1f19734fa4b41b9088bfa8 (patch) | |
| tree | 4f6b7f4073a6f6dd385fcbd26d7c381e37a24bbb /libavcodec | |
| parent | 4a85390d29b614bd5eb5fa3dde1756cf6b5c21b4 (diff) | |
| download | ffmpeg-7836583934060d31fe1f19734fa4b41b9088bfa8.tar.gz | |
j2kdec: s/j2k_/jpeg2000_/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/j2kdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 1ade0c7fc9..b052674b3a 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -101,7 +101,7 @@ static int get_bits(Jpeg2000DecoderContext *s, int n) return res; } -static void j2k_flush(Jpeg2000DecoderContext *s) +static void jpeg2000_flush(Jpeg2000DecoderContext *s) { if (bytestream2_get_byte(&s->g) == 0xff) bytestream2_skip(&s->g, 1); @@ -560,7 +560,7 @@ static int decode_packet(Jpeg2000DecoderContext *s, int bandno, cblkno, ret, nb_code_blocks; if (!(ret = get_bits(s, 1))) { - j2k_flush(s); + jpeg2000_flush(s); return 0; } else if (ret < 0) return ret; @@ -603,7 +603,7 @@ static int decode_packet(Jpeg2000DecoderContext *s, cblk->npasses += newpasses; } } - j2k_flush(s); + jpeg2000_flush(s); if (codsty->csty & JPEG2000_CSTY_EPH) { if (bytestream2_peek_be16(&s->g) == JPEG2000_EPH) |