comparison libfaad2/local_changes.diff @ 17136:d89bfef62e03

add my fix to ps_dec.c to our diff
author rathann
date Wed, 07 Dec 2005 23:07:40 +0000
parents d47cd711f617
children 5234ca38792e
comparison
equal deleted inserted replaced
17135:d2bafb1e217c 17136:d89bfef62e03
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: output.c,v 1.8 2005/03/29 18:14:24 rfelker Exp $ 133 -** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego 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: output.c,v 1.11 2005/04/05 05:43:41 rfelker Exp $ 135 +** $Id: local_changes.diff,v 1.3 2005/08/17 22:50:29 diego 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 @@
196 + 196 +
197 + return sample_buffer; 197 + return sample_buffer;
198 +} 198 +}
199 + 199 +
200 #endif 200 #endif
201 --- libfaad/ps_dec.c 2005-02-01 14:15:58.000000000 +0100
202 +++ libfaad2/ps_dec.c 2005-12-07 22:52:31.000000000 +0100
203 @@ -1960,8 +1935,8 @@
204 /* main Parametric Stereo decoding function */
205 uint8_t ps_decode(ps_info *ps, qmf_t X_left[38][64], qmf_t X_right[38][64])
206 {
207 - qmf_t X_hybrid_left[32][32] = {{0}};
208 - qmf_t X_hybrid_right[32][32] = {{0}};
209 + qmf_t X_hybrid_left[32][32] = {{{0}}};
210 + qmf_t X_hybrid_right[32][32] = {{{0}}};
211
212 /* delta decoding of the bitstream data */
213 ps_data_decode(ps);