X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=5c6bab339e599152ccbba81d4873500fd8af7e3a;hp=a1374b7319b1e66167ab316c3ee03a588f5a8327;hb=34ac5d7569ecf504bd869c0c14cb6abf2c028b13;hpb=203bfcadc14507f4d01f99099efec8ee976556b1

diff --git a/mp3dec.c b/mp3dec.c
index a1374b73..5c6bab33 100644
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file mp3dec.c paraslash's mp3 decoder */
@@ -74,7 +62,7 @@ next_frame:
 	mad_synth_frame(&pmd->synth, &pmd->frame);
 
 	for (i = 0; i < pmd->synth.pcm.length; i++) {
-		signed short s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
+		int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
 		write_int16_host_endian(fn->buf + fn->loaded, s);
 		fn->loaded += 2;
 		if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */