Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'

[ffmpeg] / libavformat / tmv.c

diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index c1d6044fa005b27ed7bb64228fef40716d41241e..513436982c660748448c960c2d513d8b9a20c275 100644 (file)
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -111,7 +111,7 @@ static int tmv_read_header(AVFormatContext *s)
     }
 
     ast->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
-    ast->codec->codec_id              = CODEC_ID_PCM_U8;
+    ast->codec->codec_id              = AV_CODEC_ID_PCM_U8;
     ast->codec->channels              = features & TMV_STEREO ? 2 : 1;
     ast->codec->bits_per_coded_sample = 8;
     ast->codec->bit_rate              = ast->codec->sample_rate *
@@ -123,7 +123,7 @@ static int tmv_read_header(AVFormatContext *s)
     av_reduce(&fps.num, &fps.den, fps.num, fps.den, 0xFFFFFFFFLL);
 
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    vst->codec->codec_id   = CODEC_ID_TMV;
+    vst->codec->codec_id   = AV_CODEC_ID_TMV;
     vst->codec->pix_fmt    = PIX_FMT_PAL8;
     vst->codec->width      = char_cols * 8;
     vst->codec->height     = char_rows * 8;