lavf: remove disabled FF_API_R_FRAME_RATE cruft

[ffmpeg] / libavformat / oggparsecelt.c

diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index 82a842c612c20500e3eaf0cd7007014cf27b3b8a..0deccc2d08ac5de6426002a2842ea47abe7d7873 100644 (file)
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "internal.h"
 #include "oggdec.h"
 
 struct oggcelt_private {
@@ -64,15 +65,14 @@ static int celt_header(AVFormatContext *s, int idx)
         av_free(os->private);
         av_free(st->codec->extradata);
         st->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
-        st->codec->codec_id       = CODEC_ID_CELT;
+        st->codec->codec_id       = AV_CODEC_ID_CELT;
         st->codec->sample_rate    = sample_rate;
         st->codec->channels       = nb_channels;
         st->codec->frame_size     = frame_size;
-        st->codec->sample_fmt     = AV_SAMPLE_FMT_S16;
         st->codec->extradata      = extradata;
         st->codec->extradata_size = 2 * sizeof(uint32_t);
         if (sample_rate)
-            av_set_pts_info(st, 64, 1, sample_rate);
+            avpriv_set_pts_info(st, 64, 1, sample_rate);
         priv->extra_headers_left  = 1 + extra_headers;
         os->private = priv;
         AV_WL32(extradata + 0, overlap);
@@ -93,4 +93,5 @@ const struct ogg_codec ff_celt_codec = {
     .magic     = "CELT    ",
     .magicsize = 8,
     .header    = celt_header,
+    .nb_header = 2,
 };