-
Michael Niedermayer authored
* commit '5c0a0983': libopenjpegdec: return meaningful error codes Conflicts: libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4427fe7e
* commit '5c0a0983': libopenjpegdec: return meaningful error codes Conflicts: libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>