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/muxer_mpeg.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/muxer_mpeg.c')
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 35ee3fed36..223a18ad67 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -32,8 +32,10 @@ #include "stream/stream.h" #include "muxer.h" #include "demuxer.h" +#include "demux_ts.h" #include "stheader.h" #include "m_option.h" +#include "aac_hdr.h" #include "mpeg_hdr.h" #include "mp3_hdr.h" #include "liba52/a52.h" @@ -231,8 +233,6 @@ m_option_t mpegopts_conf[] = { {NULL, NULL, 0, 0, 0, 0, NULL} }; -int mp_a52_framesize(uint8_t *buf, int *srate); - static void fix_audio_sys_header(muxer_priv_t *priv, uint8_t id, uint8_t newid, uint32_t size) { uint8_t i; @@ -2067,8 +2067,6 @@ static int analyze_mpa(muxer_stream_t *s) return layer; //actual layer with the highest score } -int aac_parse_frame(uint8_t *buf, int *srate, int *num); - static int parse_audio(muxer_stream_t *s, int finalize, unsigned int *nf, double *timer, double delay, int drop) { int i, j, len, chans, srate, spf, layer, dummy, tot, num, frm_idx; |