-
Michael Niedermayer authored
* commit 'ef35d6db': jpeg2000: Propagate error code from get_cox() jpeg2000: Check that nreslevels2decode has been initialized before use Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
ac3ca3d3