ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Jun 21 13:02:34 2015 +0200| [d23b3f3940a9cd160f374edb051bfac4fd898030] | committer: Michael Niedermayer
avcodec/jpeg2000dwt: Also test 9/7 integer DWT Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d23b3f3940a9cd160f374edb051bfac4fd898030 --- libavcodec/jpeg2000dwt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index c0483c3..314a274 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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
