Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'

[ffmpeg] / libavformat / yop.c

diff --git a/libavformat/yop.c b/libavformat/yop.c
index 7fd28af0e2009c89a4501f6ea321aeb31f289ed7..1185a3efc7c5793579e4e1a81e763cae337bf7c9 100644 (file)
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -77,14 +77,14 @@ static int yop_read_header(AVFormatContext *s)
     // Audio
     audio_dec               = audio_stream->codec;
     audio_dec->codec_type   = AVMEDIA_TYPE_AUDIO;
-    audio_dec->codec_id     = CODEC_ID_ADPCM_IMA_APC;
+    audio_dec->codec_id     = AV_CODEC_ID_ADPCM_IMA_APC;
     audio_dec->channels     = 1;
     audio_dec->sample_rate  = 22050;
 
     // Video
     video_dec               = video_stream->codec;
     video_dec->codec_type   = AVMEDIA_TYPE_VIDEO;
-    video_dec->codec_id     = CODEC_ID_YOP;
+    video_dec->codec_id     = AV_CODEC_ID_YOP;
 
     avio_skip(pb, 6);