lavf: remove disabled FF_API_R_FRAME_RATE cruft

[ffmpeg] / libavformat / pva.c

diff --git a/libavformat/pva.c b/libavformat/pva.c
index 064f4039cce87ddf1d14edbdb8e829eb6ff6be30..53041ba494d0d5207ff475711595ea4b87a204f9 100644 (file)
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -47,7 +47,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);
@@ -55,7 +55,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);
@@ -203,7 +203,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
 
 AVInputFormat ff_pva_demuxer = {
     .name           = "pva",
-    .long_name      = NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("TechnoTrend PVA"),
     .priv_data_size = sizeof(PVAContext),
     .read_probe     = pva_probe,
     .read_header    = pva_read_header,