Mercurial > mplayer.hg
comparison libfaad2/local_changes.diff @ 17137:5234ca38792e
add fix for sbr_dec.c to local diff, too
| author | rathann |
|---|---|
| date | Wed, 07 Dec 2005 23:13:24 +0000 |
| parents | d89bfef62e03 |
| children | 53c3eaaf8b49 |
comparison
equal
deleted
inserted
replaced
| 17136:d89bfef62e03 | 17137:5234ca38792e |
|---|---|
| 128 ** forbidden. | 128 ** forbidden. |
| 129 ** | 129 ** |
| 130 -** Commercial non-GPL licensing of this software is possible. | 130 -** Commercial non-GPL licensing of this software is possible. |
| 131 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | 131 -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. |
| 132 -** | 132 -** |
| 133 -** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego Exp $ | 133 -** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ |
| 134 +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 | 134 +** Initially modified for use with MPlayer by Rich Felker on 2005/03/29 |
| 135 +** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego Exp $ | 135 +** $Id: local_changes.diff,v 1.4 2005/12/07 23:07:40 rathann Exp $ |
| 136 +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ | 136 +** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ |
| 137 **/ | 137 **/ |
| 138 | 138 |
| 139 #include "common.h" | 139 #include "common.h" |
| 140 @@ -462,7 +462,7 @@ | 140 @@ -462,7 +462,7 @@ |
| 209 + qmf_t X_hybrid_left[32][32] = {{{0}}}; | 209 + qmf_t X_hybrid_left[32][32] = {{{0}}}; |
| 210 + qmf_t X_hybrid_right[32][32] = {{{0}}}; | 210 + qmf_t X_hybrid_right[32][32] = {{{0}}}; |
| 211 | 211 |
| 212 /* delta decoding of the bitstream data */ | 212 /* delta decoding of the bitstream data */ |
| 213 ps_data_decode(ps); | 213 ps_data_decode(ps); |
| 214 --- libfaad/sbr_dec.c 2005-12-07 22:52:03.000000000 +0100 | |
| 215 +++ libfaad2/sbr_dec.c 2005-12-07 22:52:31.000000000 +0100 | |
| 216 @@ -604,8 +527,8 @@ | |
| 217 uint8_t l, k; | |
| 218 uint8_t dont_process = 0; | |
| 219 uint8_t ret = 0; | |
| 220 - ALIGN qmf_t X_left[38][64] = {{0}}; | |
| 221 - ALIGN qmf_t X_right[38][64] = {{0}}; /* must set this to 0 */ | |
| 222 + ALIGN qmf_t X_left[38][64] = {{{0}}}; | |
| 223 + ALIGN qmf_t X_right[38][64] = {{{0}}}; /* must set this to 0 */ | |
| 224 | |
| 225 if (sbr == NULL) | |
| 226 return 20; |
