Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / pva.c

diff --git a/libavformat/pva.c b/libavformat/pva.c
index 0e1605d326f08ddc21ddfda1e5c54c2869c65875..ff8ccee8524816a4e363482f4a56499aa69ea925 100644 (file)
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -60,7 +60,7 @@ static int pva_read_header(AVFormatContext *s) {
     if (!(st = avformat_new_stream(s, NULL)))
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id   = CODEC_ID_MPEG2VIDEO;
+    st->codec->codec_id   = AV_CODEC_ID_MPEG2VIDEO;
     st->need_parsing      = AVSTREAM_PARSE_FULL;
     avpriv_set_pts_info(st, 32, 1, 90000);
     av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME);
@@ -68,7 +68,7 @@ static int pva_read_header(AVFormatContext *s) {
     if (!(st = avformat_new_stream(s, NULL)))
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id   = CODEC_ID_MP2;
+    st->codec->codec_id   = AV_CODEC_ID_MP2;
     st->need_parsing      = AVSTREAM_PARSE_FULL;
     avpriv_set_pts_info(st, 33, 1, 90000);
     av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME);