diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 03:33:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 03:33:31 +0200 |
commit | 4af9eb4f75c3199bb44fe7c960b9a5bcea5b7f39 (patch) | |
tree | 980542f4979ce714022187627ad303e1334b0f29 | |
parent | dc73c7adc0284871af34100a6062378c07a63569 (diff) | |
download | ffmpeg-4af9eb4f75c3199bb44fe7c960b9a5bcea5b7f39.tar.gz |
avcodec/jpeg2000dec: Remove unused variable and argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/jpeg2000dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 507893a920..162deb78fe 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1023,7 +1023,7 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile /* TIER-1 routines */ static void decode_sigpass(Jpeg2000T1Context *t1, int width, int height, - int bpno, int bandno, int bpass_csty_symbol, + int bpno, int bandno, int vert_causal_ctx_csty_symbol) { int mask = 3 << (bpno - 1), y0, x, y; @@ -1143,7 +1143,6 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, { int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; int pass_cnt = 0; - int bpass_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_BYPASS; int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC; int term_cnt = 0; int coder_type; @@ -1169,7 +1168,6 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, switch(pass_t) { case 0: decode_sigpass(t1, width, height, bpno + 1, bandpos, - bpass_csty_symbol && (pass_cnt >= 3*3), vert_causal_ctx_csty_symbol); break; case 1: |