Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking'

[ffmpeg] / libavformat / libmodplug.c

diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c
index 8b4e4f3bcd46c3ec44babda5b6efadee647913e6..dfbf67c2d2f4c7835493c070c33156f30c04cab5 100644 (file)
--- a/libavformat/libmodplug.c
+++ b/libavformat/libmodplug.c
@@ -27,6 +27,7 @@
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
+#include "internal.h"
 
 typedef struct ModPlugContext {
     const AVClass *class;
@@ -217,10 +218,10 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (!modplug->f)
         return AVERROR_INVALIDDATA;
 
-    st = av_new_stream(s, 0);
+    st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
-    av_set_pts_info(st, 64, 1, 1000);
+    avpriv_set_pts_info(st, 64, 1, 1000);
     st->duration = ModPlug_GetLength(modplug->f);
     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id    = CODEC_ID_PCM_S16LE;
@@ -231,10 +232,10 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
     modplug->ts_per_packet = 1000*AUDIO_PKT_SIZE / (4*44100.);
 
     if (modplug->video_stream) {
-        AVStream *vst = av_new_stream(s, 1);
+        AVStream *vst = avformat_new_stream(s, NULL);
         if (!vst)
             return AVERROR(ENOMEM);
-        av_set_pts_info(vst, 64, 1, 1000);
+        avpriv_set_pts_info(vst, 64, 1, 1000);
         vst->duration = st->duration;
         vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         vst->codec->codec_id   = CODEC_ID_XBIN;