summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-21 13:02:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-21 13:43:02 +0200
commitd23b3f3940a9cd160f374edb051bfac4fd898030 (patch)
treef42bf35fe4e1882f47cd6abf92f87ceef36386a0 /libavcodec
parent3bd46914fbf2c476d437b6312d1f714f35ae5299 (diff)
avcodec/jpeg2000dwt: Also test 9/7 integer DWT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/jpeg2000dwt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index c0483c383f..314a27428f 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -265,8 +265,6 @@ static void dwt_encode97_int(DWTContext *s, int *t)
lp;
int *l;
- av_assert1(!mh && !mv);
-
// VER_SD
l = line + mv;
for (lp = 0; lp < lh; lp++) {
@@ -669,6 +667,9 @@ int main(void) {
ret = test_dwt(array, ref, border, decomp_levels, FF_DWT53, 0);
if (ret)
return ret;
+ ret = test_dwt(array, ref, border, decomp_levels, FF_DWT97_INT, FFMIN(7+5*decomp_levels, 15+3*decomp_levels));
+ if (ret)
+ return ret;
}
return 0;