Mercurial > mplayer.hg

annotate libmpcodecs/ae_faac.h @ 32580:ed5e29af7847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix TS files with MP4 ES AAC descriptor to be correctly recognized as AAC and not AAC in LATM. This fixes playback of http://samples.mplayerhq.hu/A-codecs/AAC/freetv_aac_latm.ts, actual LATM samples seem unaffected.
author reimar
date Sun, 28 Nov 2010 18:02:50 +0000
parents 3afcf20a13e4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30421
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
1 /*
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
2 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
5 * it under the terms of the GNU General Public License as published by
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
7 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
8 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
12 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
13 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
14 * You should have received a copy of the GNU General Public License along
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
17 */
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 26147
diff changeset
18
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
19 #ifndef MPLAYER_AE_FAAC_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
20 #define MPLAYER_AE_FAAC_H
15259
854990f357ee added faac audio encoder
nicodvb
parents:
diff changeset
21
31438
3afcf20a13e4 Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents: 30421
diff changeset
22 #include "libmpdemux/muxer.h"
15259
854990f357ee added faac audio encoder
nicodvb
parents:
diff changeset
23 #include "ae.h"
31438
3afcf20a13e4 Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents: 30421
diff changeset
24 #include "m_option.h"
3afcf20a13e4 Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents: 30421
diff changeset
25
3afcf20a13e4 Move faac/lame/toolame/twolame option array declarations to appropriate headers.
diego
parents: 30421
diff changeset
26 extern const m_option_t faacopts_conf[];
15259
854990f357ee added faac audio encoder
nicodvb
parents:
diff changeset
27
854990f357ee added faac audio encoder
nicodvb
parents:
diff changeset
28 int mpae_init_faac(audio_encoder_t *encoder);
854990f357ee added faac audio encoder
nicodvb
parents:
diff changeset
29
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25869
diff changeset
30 #endif /* MPLAYER_AE_FAAC_H */