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/sbr_dec.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/sbr_dec.c')
| -rw-r--r-- | libfaad2/sbr_dec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libfaad2/sbr_dec.c b/libfaad2/sbr_dec.c index ca41d6f7e7..e3ab1cf6ba 100644 --- a/libfaad2/sbr_dec.c +++ b/libfaad2/sbr_dec.c @@ -22,7 +22,10 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: sbr_dec.c,v 1.37 2004/06/30 12:45:56 menno Exp $ +** Initially modified for use with MPlayer on 2005/12/05 +** $Id: sbr_dec.c,v 1.39 2004/09/04 14:56:28 menno Exp $ +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ +** local_changes.diff contains the exact changes to this file. **/ @@ -79,7 +82,6 @@ sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac, #ifdef DRM sbr->Is_DRM_SBR = IsDRM; #endif - sbr->bs_samplerate_mode = 1; sbr->tHFGen = T_HFGEN; sbr->tHFAdj = T_HFADJ; @@ -575,7 +577,7 @@ uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *righ #ifdef DRM_PS if (sbr->Is_DRM_SBR) { - drm_ps_decode(sbr->drm_ps, sbr->sample_rate, X_left, X_right); + drm_ps_decode(sbr->drm_ps, (sbr->ret > 0), sbr->sample_rate, X_left, X_right); } else { #endif #ifdef PS_DEC |