Port pred8x8l_horizontal_down_mmxext (H.264 intra prediction) from x264

[ffmpeg] / libavcodec / libopenjpeg.c

diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index 93ef4e2e8648ca61812fea8d06125fcddc75b304..a23b17f12ddc8d4d942950339dcf940068035c7f 100644 (file)
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -24,6 +24,7 @@
 * JPEG 2000 decoder using libopenjpeg
 */
 
+#include "libavcore/imgutils.h"
 #include "avcodec.h"
 #include "libavutil/intreadwrite.h"
 #define  OPJ_STATIC
@@ -113,7 +114,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
     }
     width  = image->comps[0].w << avctx->lowres;
     height = image->comps[0].h << avctx->lowres;
-    if(av_check_image_size(width, height, 0, avctx) < 0) {
+    if(av_image_check_size(width, height, 0, avctx) < 0) {
         av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
         goto done;
     }