diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-07 23:13:24 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-07 23:13:24 +0000 |
| commit | 9fd71a03a6a364081bbb13b1fdc00ca28cdc94c5 (patch) | |
| tree | d37046e8d40ef496f588361db02db8f5bfcae9af /libfaad2 | |
| parent | 2664b81b63c3e42e8906fccd94d333be7472db6b (diff) | |
| download | mpv-9fd71a03a6a364081bbb13b1fdc00ca28cdc94c5.tar.bz2 mpv-9fd71a03a6a364081bbb13b1fdc00ca28cdc94c5.tar.xz | |
add fix for sbr_dec.c to local diff, too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17138 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2')
| -rw-r--r-- | libfaad2/local_changes.diff | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff index 9551e54421..c3ea3a54cf 100644 --- a/libfaad2/local_changes.diff +++ b/libfaad2/local_changes.diff @@ -130,9 +130,9 @@ -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** --** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego Exp $ +-** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 -+** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego Exp $ ++** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -211,3 +211,16 @@ /* delta decoding of the bitstream data */ ps_data_decode(ps); +--- libfaad/sbr_dec.c 2005-12-07 22:52:03.000000000 +0100 ++++ libfaad2/sbr_dec.c 2005-12-07 22:52:31.000000000 +0100 +@@ -604,8 +527,8 @@ + uint8_t l, k; + uint8_t dont_process = 0; + uint8_t ret = 0; +- ALIGN qmf_t X_left[38][64] = {{0}}; +- ALIGN qmf_t X_right[38][64] = {{0}}; /* must set this to 0 */ ++ ALIGN qmf_t X_left[38][64] = {{{0}}}; ++ ALIGN qmf_t X_right[38][64] = {{{0}}}; /* must set this to 0 */ + + if (sbr == NULL) + return 20; |