diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-22 02:37:08 -0500 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-22 02:37:08 -0500 |
| commit | bc1e061c245cfb1d8a8fdd52cfa394bf117f770a (patch) | |
| tree | 05f33f51bab749a67c82c67ae34a4f83edeb903a /libavcodec/jpeg2000dwt.c | |
| parent | a4a2a44d6836e2f58d9112bdb384e4f2cfac905d (diff) | |
| parent | 79f407b79a825c3123aff65cef64b383eca5a95e (diff) | |
| download | android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.gz android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.bz2 android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.zip | |
Merge branch 'release/2.8' of https://github.com/FFmpeg/FFmpeg into cm-13.0
Diffstat (limited to 'libavcodec/jpeg2000dwt.c')
| -rw-r--r-- | libavcodec/jpeg2000dwt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c index 2bf25a8c4e..a46c93a9b2 100644 --- a/libavcodec/jpeg2000dwt.c +++ b/libavcodec/jpeg2000dwt.c @@ -580,6 +580,9 @@ int ff_jpeg2000_dwt_init(DWTContext *s, int border[2][2], int ff_dwt_encode(DWTContext *s, void *t) { + if (s->ndeclevels == 0) + return 0; + switch(s->type){ case FF_DWT97: dwt_encode97_float(s, t); break; @@ -595,6 +598,9 @@ int ff_dwt_encode(DWTContext *s, void *t) int ff_dwt_decode(DWTContext *s, void *t) { + if (s->ndeclevels == 0) + return 0; + switch (s->type) { case FF_DWT97: dwt_decode97_float(s, t); |