diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-18 19:39:34 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-18 19:39:34 +0000 |
| commit | 82361d50d0dcbb72132fe1203fe152a89dd165e9 (patch) | |
| tree | 4abb0b4820172c1167ddb75433038be03aa44063 /libfaad2/neaacdec.h | |
| parent | b664e7f3216a22b9e3f92e4861733a3222fa11d8 (diff) | |
| download | mpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.bz2 mpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.xz | |
Update to faad2 cvs 20040915+MPlayer fixes
Patch by me and Emanuele Giaquinta
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18142 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/neaacdec.h')
| -rw-r--r-- | libfaad2/neaacdec.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libfaad2/neaacdec.h b/libfaad2/neaacdec.h index 71ab4078af..347732d7d4 100644 --- a/libfaad2/neaacdec.h +++ b/libfaad2/neaacdec.h @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: neaacdec.h,v 1.4 2004/04/03 10:49:14 menno Exp $ +** $Id: neaacdec.h,v 1.5 2004/09/04 14:56:27 menno Exp $ **/ #ifndef __NEAACDEC_H__ @@ -189,6 +189,9 @@ typedef struct NeAACDecFrameInfo unsigned char num_back_channels; unsigned char num_lfe_channels; unsigned char channel_position[64]; + + /* PS: 0: off, 1: on */ + unsigned char ps; } NeAACDecFrameInfo; char* NEAACDECAPI NeAACDecGetErrorMessage(unsigned char errcode); @@ -227,6 +230,13 @@ void* NEAACDECAPI NeAACDecDecode(NeAACDecHandle hDecoder, unsigned char *buffer, unsigned long buffer_size); +void* NEAACDECAPI NeAACDecDecode2(NeAACDecHandle hDecoder, + NeAACDecFrameInfo *hInfo, + unsigned char *buffer, + unsigned long buffer_size, + void **sample_buffer, + unsigned long sample_buffer_size); + char NEAACDECAPI NeAACDecAudioSpecificConfig(unsigned char *pBuffer, unsigned long buffer_size, mp4AudioSpecificConfig *mp4ASC); |