Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / act.c

diff --git a/libavformat/act.c b/libavformat/act.c
index 0c41ba0340972550de04f695e62f96caec5fafa3..e47afc1d277100ef9b7276ba4210bd71acb4972c 100644 (file)
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -20,6 +20,7 @@
  */
 #include "avformat.h"
 #include "riff.h"
+#include "internal.h"
 #include "libavcodec/get_bits.h"
 
 #define CHUNK_SIZE 512
@@ -59,8 +60,7 @@ static int probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     ACTContext* ctx = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -88,7 +88,7 @@ static int read_header(AVFormatContext *s,
 
     st->codec->frame_size=80;
     st->codec->channels=1;
-    av_set_pts_info(st, 64, 1, 100);
+    avpriv_set_pts_info(st, 64, 1, 100);
 
     st->codec->codec_id=CODEC_ID_G729;