From 9905880267cacb259eb11cc7cdbdfbb4d7149325 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:28:24 +0000 Subject: Add separate header for aac_parse_frame(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30616 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/muxer_mpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libmpdemux/muxer_mpeg.c') diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index 20b552a96e..faa5eb4bf5 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -34,6 +34,7 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" +#include "aac_hdr.h" #include "mpeg_hdr.h" #include "mp3_hdr.h" #include "liba52/a52.h" @@ -2067,8 +2068,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; -- cgit v1.2.3 From 6f8c91b9a2094f8d52978359ac89841352ac9163 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 17 Feb 2010 22:40:50 +0000 Subject: Add separate header for mp_a52_framesize(); avoids forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30618 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/muxer_mpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libmpdemux/muxer_mpeg.c') diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index faa5eb4bf5..fc066d1eca 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -32,6 +32,7 @@ #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" @@ -232,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; -- cgit v1.2.3