diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:28:24 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:28:24 +0000 |
commit | 9905880267cacb259eb11cc7cdbdfbb4d7149325 (patch) | |
tree | 5a8d747a73b6e80a19c07ff3342d9f3f5e723be2 /libmpdemux | |
parent | 2df3416d32c3e1732bbf96a8b020792db40ad7a2 (diff) | |
download | mpv-9905880267cacb259eb11cc7cdbdfbb4d7149325.tar.bz2 mpv-9905880267cacb259eb11cc7cdbdfbb4d7149325.tar.xz |
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
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/aac_hdr.c | 1 | ||||
-rw-r--r-- | libmpdemux/aac_hdr.h | 26 | ||||
-rw-r--r-- | libmpdemux/demux_aac.c | 8 | ||||
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 3 |
4 files changed, 29 insertions, 9 deletions
diff --git a/libmpdemux/aac_hdr.c b/libmpdemux/aac_hdr.c index 1866288349..aed06f0e28 100644 --- a/libmpdemux/aac_hdr.c +++ b/libmpdemux/aac_hdr.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include "aac_hdr.h" /// \param srate (out) sample rate /// \param num (out) number of audio frames in this ADTS frame diff --git a/libmpdemux/aac_hdr.h b/libmpdemux/aac_hdr.h new file mode 100644 index 0000000000..be56368925 --- /dev/null +++ b/libmpdemux/aac_hdr.h @@ -0,0 +1,26 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_AAC_HDR_H +#define MPLAYER_AAC_HDR_H + +#include <stdint.h> + +int aac_parse_frame(uint8_t *buf, int *srate, int *num); + +#endif /* MPLAYER_AAC_HDR_H */ 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; 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; |