Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[ffmpeg] / libavformat / smjpeg.c

diff --git a/libavformat/smjpeg.c b/libavformat/smjpeg.c
index 82316ed448aeddcf4ebfe28c06214fcceb3131d1..4edf5e8ac4047fed977e01cf19d77d0d3ec67ac1 100644 (file)
--- a/libavformat/smjpeg.c
+++ b/libavformat/smjpeg.c
@@ -29,12 +29,12 @@
 #include "smjpeg.h"
 
 const AVCodecTag ff_codec_smjpeg_video_tags[] = {
-    { CODEC_ID_MJPEG,             MKTAG('J', 'F', 'I', 'F') },
-    { CODEC_ID_NONE, 0 },
+    { AV_CODEC_ID_MJPEG,             MKTAG('J', 'F', 'I', 'F') },
+    { AV_CODEC_ID_NONE, 0 },
 };
 
 const AVCodecTag ff_codec_smjpeg_audio_tags[] = {
-    { CODEC_ID_ADPCM_IMA_SMJPEG,  MKTAG('A', 'P', 'C', 'M') },
-    { CODEC_ID_PCM_S16LE,         MKTAG('N', 'O', 'N', 'E') },
-    { CODEC_ID_NONE, 0 },
+    { AV_CODEC_ID_ADPCM_IMA_SMJPEG,  MKTAG('A', 'P', 'C', 'M') },
+    { AV_CODEC_ID_PCM_S16LE,         MKTAG('N', 'O', 'N', 'E') },
+    { AV_CODEC_ID_NONE, 0 },
 };