diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 17:39:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-26 18:07:48 +0200 |
| commit | b67fe48f3418e385acb1b4f6e8d640effa250dab (patch) | |
| tree | affbd8b5210671a51c1e6bee6c34c1653661dc07 /libavcodec/jpeg2000.c | |
| parent | 69b97739806f618b1931741fa0b42d0cf03e9c31 (diff) | |
| download | ffmpeg-b67fe48f3418e385acb1b4f6e8d640effa250dab.tar.gz | |
jpeg2000/j2k: merge getsigctxno()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 060b1fd55d..18bf1b6f99 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -95,47 +95,33 @@ static int getsigctxno(int flag, int bandno) ((flag & JPEG2000_T1_SIG_NW) ? 1 : 0) + ((flag & JPEG2000_T1_SIG_SE) ? 1 : 0) + ((flag & JPEG2000_T1_SIG_SW) ? 1 : 0); - if (bandno < 3) { + + if (bandno < 3){ if (bandno == 1) FFSWAP(int, h, v); - if (h == 2) - return 8; - if (h == 1) { - if (v >= 1) - return 7; - if (d >= 1) - return 6; + if (h == 2) return 8; + if (h == 1){ + if (v >= 1) return 7; + if (d >= 1) return 6; return 5; } - if (v == 2) - return 4; - if (v == 1) - return 3; - if (d >= 2) - return 2; - if (d == 1) - return 1; - return 0; - } else { - if (d >= 3) - return 8; - if (d == 2) { - if (h + v >= 1) - return 7; + if (v == 2) return 4; + if (v == 1) return 3; + if (d >= 2) return 2; + if (d == 1) return 1; + } else{ + if (d >= 3) return 8; + if (d == 2){ + if (h+v >= 1) return 7; return 6; } - if (d == 1) { - if (h + v >= 2) - return 5; - if (h + v == 1) - return 4; + if (d == 1){ + if (h+v >= 2) return 5; + if (h+v == 1) return 4; return 3; } - if (h + v >= 2) - return 2; - if (h + v == 1) - return 1; - return 0; + if (h+v >= 2) return 2; + if (h+v == 1) return 1; } return 0; } |