avio: deprecate url_fget_max_packet_size

[ffmpeg] / libavformat / aacdec.c

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 8737e56409871ce17c8a0952f7d1988f412b55ae..47e9bf3a1849a33c30b2c74d3f5ffe2996c610ea 100644 (file)
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -22,8 +22,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
-#include "raw.h"
-#include "id3v2.h"
+#include "rawdec.h"
 #include "id3v1.h"
 
 
@@ -36,9 +35,6 @@ static int adts_aac_probe(AVProbeData *p)
     uint8_t *buf;
     uint8_t *end = buf0 + p->buf_size - 7;
 
-    if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) {
-        buf0 += ff_id3v2_tag_len(buf0);
-    }
     buf = buf0;
 
     for(; buf < end; buf= buf2+1) {
@@ -78,12 +74,14 @@ static int adts_aac_read_header(AVFormatContext *s,
     st->need_parsing = AVSTREAM_PARSE_FULL;
 
     ff_id3v1_read(s);
-    ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC);
+
+    //LCM of all possible ADTS sample rates
+    av_set_pts_info(st, 64, 1, 28224000);
 
     return 0;
 }
 
-AVInputFormat aac_demuxer = {
+AVInputFormat ff_aac_demuxer = {
     "aac",
     NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
     0,