Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

[ffmpeg] / libavformat / ncdec.c

diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c
index 7d7b390373a3f692ce60e43207cf6767f7699662..8cb7ed4bd49b13d16fd37dc9d54f4422d42dea66 100644 (file)
--- a/libavformat/ncdec.c
+++ b/libavformat/ncdec.c
@@ -52,7 +52,7 @@ static int nc_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id   = CODEC_ID_MPEG4;
+    st->codec->codec_id   = AV_CODEC_ID_MPEG4;
     st->need_parsing      = AVSTREAM_PARSE_FULL;
 
     avpriv_set_pts_info(st, 64, 1, 100);