Merge commit '124134e42455763b28cc346fed1d07017a76e84e'

[ffmpeg] / libavformat / mtv.c

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 30c8ed791118573c78c158f1896d59ee0ddfd2da..cb50033a57041b49be0450ea8acfb8b87950f1ba 100644 (file)
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -135,7 +135,7 @@ static int mtv_read_header(AVFormatContext *s)
 
     avpriv_set_pts_info(st, 64, 1, mtv->video_fps);
     st->codec->codec_type      = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id        = CODEC_ID_RAWVIDEO;
+    st->codec->codec_id        = AV_CODEC_ID_RAWVIDEO;
     st->codec->pix_fmt         = PIX_FMT_RGB565BE;
     st->codec->width           = mtv->img_width;
     st->codec->height          = mtv->img_height;
@@ -151,7 +151,7 @@ static int mtv_read_header(AVFormatContext *s)
 
     avpriv_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
     st->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id        = CODEC_ID_MP3;
+    st->codec->codec_id        = AV_CODEC_ID_MP3;
     st->codec->bit_rate        = mtv->audio_br;
     st->need_parsing           = AVSTREAM_PARSE_FULL;
 
@@ -195,7 +195,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_mtv_demuxer = {
     .name           = "mtv",
-    .long_name      = NULL_IF_CONFIG_SMALL("MTV format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("MTV"),
     .priv_data_size = sizeof(MTVDemuxContext),
     .read_probe     = mtv_probe,
     .read_header    = mtv_read_header,