From 0ac6b92ec9da57d52b2770ebe610fbb5056c8c7c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 19 Feb 2005 01:21:19 +0000 Subject: Sync missing cosmetics from the 2004-07-12 CVS snapshot. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14730 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libfaad2/bits.h | 12 ++++++------ libfaad2/cfft_tab.h | 8 ++++---- libfaad2/common.h | 2 +- libfaad2/faad.h | 3 ++- libfaad2/mdct_tab.h | 8 ++++---- libfaad2/output.c | 8 ++++---- libfaad2/ps_dec.h | 8 ++++---- libfaad2/pulse.c | 3 ++- libfaad2/sbr_dec.h | 8 ++++---- libfaad2/sbr_qmf.c | 8 ++++---- libfaad2/sbr_qmf.h | 1 + libfaad2/specrec.c | 8 ++++---- libfaad2/structs.h | 8 ++++---- 13 files changed, 44 insertions(+), 41 deletions(-) (limited to 'libfaad2') diff --git a/libfaad2/bits.h b/libfaad2/bits.h index 2623e614d5..e35f508176 100644 --- a/libfaad2/bits.h +++ b/libfaad2/bits.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly @@ -319,7 +319,7 @@ typedef struct /* bit input */ uint32_t bufa; uint32_t bufb; - int8_t len; + int8_t len; } bits_t; @@ -333,7 +333,7 @@ static INLINE uint32_t showbits_hcr(bits_t *ld, uint8_t bits) if (ld->len >= bits) return ((ld->bufa >> (ld->len - bits)) & (0xFFFFFFFF >> (32 - bits))); else - return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits))); + return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits))); } else { if ((ld->len - bits) < 32) { diff --git a/libfaad2/cfft_tab.h b/libfaad2/cfft_tab.h index 3aaf9d8500..c4c9bcadff 100644 --- a/libfaad2/cfft_tab.h +++ b/libfaad2/cfft_tab.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/common.h b/libfaad2/common.h index 58c9b110c4..fe561e5577 100644 --- a/libfaad2/common.h +++ b/libfaad2/common.h @@ -34,7 +34,7 @@ extern "C" { #endif -/* Allow build on cygwin*/ +/* Allow build on Cygwin*/ #if defined(__CYGWIN__) #define __STRICT_ANSI__ #endif diff --git a/libfaad2/faad.h b/libfaad2/faad.h index adb4429294..8fdf7c2043 100644 --- a/libfaad2/faad.h +++ b/libfaad2/faad.h @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** 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 @@ -24,6 +24,7 @@ ** ** $Id: faad.h,v 1.47 2004/04/03 19:08:37 menno Exp $ **/ + /* warn people for update */ #pragma message("please update faad2 include filename and function names!") diff --git a/libfaad2/mdct_tab.h b/libfaad2/mdct_tab.h index c2cbec4691..bf64df7339 100644 --- a/libfaad2/mdct_tab.h +++ b/libfaad2/mdct_tab.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/output.c b/libfaad2/output.c index ccaabf28fd..6594582bbd 100644 --- a/libfaad2/output.c +++ b/libfaad2/output.c @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/ps_dec.h b/libfaad2/ps_dec.h index f41b515025..8aa7e930ee 100644 --- a/libfaad2/ps_dec.h +++ b/libfaad2/ps_dec.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/pulse.c b/libfaad2/pulse.c index 33843646c4..351a4eb74b 100644 --- a/libfaad2/pulse.c +++ b/libfaad2/pulse.c @@ -39,7 +39,8 @@ uint8_t pulse_decode(ic_stream *ics, int16_t *spec_data, uint16_t framelen) k = ics->swb_offset[pul->pulse_start_sfb]; - for(i = 0; i <= pul->number_pulse; i++) { + for (i = 0; i <= pul->number_pulse; i++) + { k += pul->pulse_offset[i]; if (k >= framelen) diff --git a/libfaad2/sbr_dec.h b/libfaad2/sbr_dec.h index 1ebcf01a0e..6bd28da6ec 100644 --- a/libfaad2/sbr_dec.h +++ b/libfaad2/sbr_dec.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/sbr_qmf.c b/libfaad2/sbr_qmf.c index e9e678d3e5..cf17b64792 100644 --- a/libfaad2/sbr_qmf.c +++ b/libfaad2/sbr_qmf.c @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/sbr_qmf.h b/libfaad2/sbr_qmf.h index 0cb2e3bf73..6ed843ca7e 100644 --- a/libfaad2/sbr_qmf.h +++ b/libfaad2/sbr_qmf.h @@ -53,3 +53,4 @@ void sbr_qmf_synthesis_64_sse(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHF } #endif #endif + diff --git a/libfaad2/specrec.c b/libfaad2/specrec.c index 1954b5f983..6d0541be14 100644 --- a/libfaad2/specrec.c +++ b/libfaad2/specrec.c @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly diff --git a/libfaad2/structs.h b/libfaad2/structs.h index 7f8dd00681..cb546d98cb 100644 --- a/libfaad2/structs.h +++ b/libfaad2/structs.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** 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 +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly -- cgit v1.2.3