diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
| commit | e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8 (patch) | |
| tree | 8553b3a4ef8164d14ff1b4a3f67e57cfa1d8908a /libfaad2/is.c | |
| parent | 2887bacbdb6bd320e4840fd230e92a59cc74b9ae (diff) | |
| download | mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.bz2 mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.xz | |
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/is.c')
| -rw-r--r-- | libfaad2/is.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libfaad2/is.c b/libfaad2/is.c index 590187746d..6418e1bae3 100644 --- a/libfaad2/is.c +++ b/libfaad2/is.c @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 -** $Id: is.c,v 1.3 2004/06/02 22:59:03 diego Exp $ +** $Id: is.c,v 1.4 2004/06/23 13:50:50 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -68,12 +68,14 @@ void is_decode(ic_stream *ics, ic_stream *icsr, real_t *l_spec, real_t *r_spec, { if (is_intensity(icsr, g, sfb)) { +#ifdef MAIN_DEC /* For scalefactor bands coded in intensity stereo the corresponding predictors in the right channel are switched to "off". */ ics->pred.prediction_used[sfb] = 0; icsr->pred.prediction_used[sfb] = 0; +#endif #ifndef FIXED_POINT scale = (real_t)pow(0.5, (0.25*icsr->scale_factors[g][sfb])); |