diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpdemux/demux_aac.c | |
parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz |
Merge svn changes up to r30643
Diffstat (limited to 'libmpdemux/demux_aac.c')
-rw-r--r-- | libmpdemux/demux_aac.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 2ebbb2995e..cfbedfc8c1 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -28,7 +28,7 @@ #include "demuxer.h" #include "parse_es.h" #include "stheader.h" - +#include "aac_hdr.h" #include "ms_hdr.h" typedef struct { @@ -39,12 +39,6 @@ typedef struct { int bitrate; /// bitrate computed as size/time } aac_priv_t; -/// \param srate (out) sample rate -/// \param num (out) number of audio frames in this ADTS frame -/// \return size of the ADTS frame in bytes -/// aac_parse_frames needs a buffer at least 8 bytes long -int aac_parse_frame(uint8_t *buf, int *srate, int *num); - static int demux_aac_init(demuxer_t *demuxer) { aac_priv_t *priv; |