Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / yop.c

diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index b1064c97152fb933f432844698d8b399ad0d301e..a117e2d7912210b0248944769b72287694f63ba7 100644 (file)
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -24,7 +24,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
 
 #include "avcodec.h"
 #include "get_bits.h"
@@ -85,7 +85,7 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
     s->avctx = avctx;
 
     if (avctx->width & 1 || avctx->height & 1 ||
-        av_check_image_size(avctx->width, avctx->height, 0, avctx) < 0) {
+        av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
         av_log(avctx, AV_LOG_ERROR, "YOP has invalid dimensions\n");
         return -1;
     }
@@ -248,7 +248,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     return avpkt->size;
 }
 
-AVCodec yop_decoder = {
+AVCodec ff_yop_decoder = {
     "yop",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_YOP,