Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / iv8.c

diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index c70a2860198510afef7187147241f8e4e72008c9..38b79609f6477876ad856fa4deb015de7d26c6df 100644 (file)
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -46,7 +46,7 @@ static int 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, 90000);
 
@@ -110,7 +110,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_iv8_demuxer = {
     .name           = "iv8",
-    .long_name      = NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
+    .long_name      = NULL_IF_CONFIG_SMALL("IndigoVision 8000 video"),
     .read_probe     = probe,
     .read_header    = read_header,
     .read_packet    = read_packet,