summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2005-05-30 12:08:49 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2005-05-30 12:08:49 +0000
commit77373630ab3cbda175ac723b96b75aca9aa92ffe (patch)
tree8897a9fe603eab71c58583ac6c5bc05f526f1e65 /src/demuxers
parent796f3523ef00cbb7716550d2493d9741287c5c77 (diff)
downloadxine-lib-77373630ab3cbda175ac723b96b75aca9aa92ffe.tar.gz
xine-lib-77373630ab3cbda175ac723b96b75aca9aa92ffe.tar.bz2
No need to guess parameters, faad will read them from ADTS/ADIF header
CVS patchset: 7596 CVS date: 2005/05/30 12:08:49
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_aac.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index 6201f5b9e..e7895c1eb 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -21,7 +21,7 @@
* This demuxer detects ADIF and ADTS headers in AAC files.
* Then it shovels buffer-sized chunks over to the AAC decoder.
*
- * $Id: demux_aac.c,v 1.7 2005/05/21 14:13:04 jstembridge Exp $
+ * $Id: demux_aac.c,v 1.8 2005/05/30 12:08:49 jstembridge Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -168,12 +168,7 @@ static void demux_aac_send_headers(demux_plugin_t *this_gen) {
if (this->audio_fifo) {
buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
buf->type = BUF_AUDIO_AAC;
- buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
- buf->decoder_info[0] = 0;
- /* this is a guess at the correct parameters */
- buf->decoder_info[1] = 44100;
- buf->decoder_info[2] = 16;
- buf->decoder_info[3] = 2;
+ buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_FRAME_END;
buf->content = NULL;
buf->size = 0;
this->audio_fifo->put (this->audio_fifo, buf);