diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 21:14:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 21:44:34 +0200 |
| commit | 376e89e280fd94fbb6cffabf6971825d5e2e248e (patch) | |
| tree | 26baa7d31e0fe332e0784908bf8564897a00e26e /libavcodec | |
| parent | a8d98377b168f40343e911de2b12b09d8729efa5 (diff) | |
| download | ffmpeg-376e89e280fd94fbb6cffabf6971825d5e2e248e.tar.gz | |
j2kdec: s/decode_packets/jpeg2000_decode_packets/
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/j2kdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 3e78b0b5f8..18faa15ba6 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -588,7 +588,7 @@ static int decode_packet(J2kDecoderContext *s, J2kCodingStyle *codsty, J2kResLev return 0; } -static int decode_packets(J2kDecoderContext *s, J2kTile *tile) +static int jpeg2000_decode_packets(J2kDecoderContext *s, J2kTile *tile) { int layno, reslevelno, compno, precno, ok_reslevel; s->bit_index = 8; @@ -942,7 +942,7 @@ static int decode_codestream(J2kDecoderContext *s) av_log(s->avctx, AV_LOG_ERROR, "tile initialization failed\n"); return ret; } - if (ret = decode_packets(s, tile)) { + if (ret = jpeg2000_decode_packets(s, tile)) { av_log(s->avctx, AV_LOG_ERROR, "packets decoding failed\n"); return ret; } |