diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 13:02:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 13:43:02 +0200 |
| commit | d23b3f3940a9cd160f374edb051bfac4fd898030 (patch) | |
| tree | f42bf35fe4e1882f47cd6abf92f87ceef36386a0 | |
| parent | 3bd46914fbf2c476d437b6312d1f714f35ae5299 (diff) | |
| download | ffmpeg-d23b3f3940a9cd160f374edb051bfac4fd898030.tar.gz | |
avcodec/jpeg2000dwt: Also test 9/7 integer DWT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dwt.c | 5 |
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; |