Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking'

[ffmpeg] / libavformat / xmv.c

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 9c17a14fa1582ce4bbb7c32ee61cee5075c99ead..f01e0aa77b38abb957773d66a43426691ec9f9b6 100644 (file)
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -30,6 +30,7 @@
 #include "libavutil/intreadwrite.h"
 
 #include "avformat.h"
+#include "internal.h"
 #include "riff.h"
 
 /** The min size of an XMV header. */
@@ -147,11 +148,11 @@ static int xmv_read_header(AVFormatContext *s,
 
     /* Video track */
 
-    vst = av_new_stream(s, 0);
+    vst = avformat_new_stream(s, NULL);
     if (!vst)
         return AVERROR(ENOMEM);
 
-    av_set_pts_info(vst, 32, 1, 1000);
+    avpriv_set_pts_info(vst, 32, 1, 1000);
 
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = CODEC_ID_WMV2;
@@ -202,7 +203,7 @@ static int xmv_read_header(AVFormatContext *s,
             av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream "
                                       "(0x%04X)\n", packet->flags);
 
-        ast = av_new_stream(s, audio_track);
+        ast = avformat_new_stream(s, NULL);
         if (!ast)
             return AVERROR(ENOMEM);
 
@@ -215,7 +216,7 @@ static int xmv_read_header(AVFormatContext *s,
         ast->codec->bit_rate              = packet->bit_rate;
         ast->codec->block_align           = 36 * packet->channels;
 
-        av_set_pts_info(ast, 32, packet->block_samples, packet->sample_rate);
+        avpriv_set_pts_info(ast, 32, packet->block_samples, packet->sample_rate);
 
         packet->stream_index = ast->index;