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/decoder.c | |
| 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/decoder.c')
| -rw-r--r-- | libfaad2/decoder.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libfaad2/decoder.c b/libfaad2/decoder.c index b4a7c4b1b7..f7d699f785 100644 --- a/libfaad2/decoder.c +++ b/libfaad2/decoder.c @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: decoder.c,v 1.104 2004/06/30 12:45:56 menno Exp $ +** $Id: decoder.c,v 1.107 2004/09/08 09:43:11 gcp Exp $ **/ #include "common.h" @@ -143,15 +143,6 @@ NeAACDecHandle NEAACDECAPI NeAACDecOpen(void) hDecoder->drc = drc_init(REAL_CONST(1.0), REAL_CONST(1.0)); -#ifdef USE_SSE - if (cpu_has_sse()) - { - hDecoder->apply_sf_func = apply_scalefactors_sse; - } else { - hDecoder->apply_sf_func = apply_scalefactors; - } -#endif - return hDecoder; } @@ -901,6 +892,9 @@ static void* aac_frame_decode(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, hInfo->header_type = ADIF; if (hDecoder->adts_header_present) hInfo->header_type = ADTS; +#if (defined(PS_DEC) || defined(DRM_PS)) + hInfo->ps = hDecoder->ps_used_global; +#endif /* check if frame has channel elements */ if (channels == 0) |