Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / aacdec.c

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 7df11bf95c03e74c9ab945e8fe325236f03fe5df..ff58c366757eca69b71fcd1c88fcb296e292bfb5 100644 (file)
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
+#include "internal.h"
 #include "rawdec.h"
 #include "id3v1.h"
 
@@ -61,8 +62,7 @@ static int adts_aac_probe(AVProbeData *p)
     else                   return 0;
 }
 
-static int adts_aac_read_header(AVFormatContext *s,
-                                AVFormatParameters *ap)
+static int adts_aac_read_header(AVFormatContext *s)
 {
     AVStream *st;
 
@@ -77,7 +77,7 @@ static int adts_aac_read_header(AVFormatContext *s,
     ff_id3v1_read(s);
 
     //LCM of all possible ADTS sample rates
-    av_set_pts_info(st, 64, 1, 28224000);
+    avpriv_set_pts_info(st, 64, 1, 28224000);
 
     return 0;
 }