lavf: remove disabled FF_API_R_FRAME_RATE cruft

[ffmpeg] / libavformat / c93.c

diff --git a/libavformat/c93.c b/libavformat/c93.c
index d82086d29647a5660c456f4f9023bfc378f93796..3f2a98fcc4e8ad0211bd4a65fa2cc6463555e97d 100644 (file)
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -57,8 +57,7 @@ static int probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     AVStream *video;
     AVIOContext *pb = s->pb;
@@ -85,7 +84,7 @@ static int read_header(AVFormatContext *s,
         return AVERROR(ENOMEM);
 
     video->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    video->codec->codec_id = CODEC_ID_C93;
+    video->codec->codec_id = AV_CODEC_ID_C93;
     video->codec->width = 320;
     video->codec->height = 192;
     /* 4:3 320x200 with 8 empty lines */
@@ -124,7 +123,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
                 c93->audio->codec->codec_type = AVMEDIA_TYPE_AUDIO;
             }
             avio_skip(pb, 26); /* VOC header */
-            ret = voc_get_packet(s, pkt, c93->audio, datasize - 26);
+            ret = ff_voc_get_packet(s, pkt, c93->audio, datasize - 26);
             if (ret > 0) {
                 pkt->stream_index = 1;
                 pkt->flags |= AV_PKT_FLAG_KEY;