Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

[ffmpeg] / libavcodec / zmbvenc.c

diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 172fb11b65bbeb1bafdb41f87fdf94b7a4e55d1f..df5b90f1cecdae31e31155b46e9cc5ab6194a657 100644 (file)
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "internal.h"
@@ -337,7 +338,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 AVCodec ff_zmbv_encoder = {
     .name           = "zmbv",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_ZMBV,
+    .id             = AV_CODEC_ID_ZMBV,
     .priv_data_size = sizeof(ZmbvEncContext),
     .init           = encode_init,
     .encode2        = encode_frame,