RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
diego 2005-02-19 01:21:19 +00:00
parent 762f1adf6f
commit 0ac6b92ec9
13 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfaad2/bits.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly
@ -319,7 +319,7 @@ typedef struct
/* bit input */ /* bit input */
uint32_t bufa; uint32_t bufa;
uint32_t bufb; uint32_t bufb;
int8_t len; int8_t len;
} bits_t; } bits_t;
@ -333,7 +333,7 @@ static INLINE uint32_t showbits_hcr(bits_t *ld, uint8_t bits)
if (ld->len >= bits) if (ld->len >= bits)
return ((ld->bufa >> (ld->len - bits)) & (0xFFFFFFFF >> (32 - bits))); return ((ld->bufa >> (ld->len - bits)) & (0xFFFFFFFF >> (32 - bits)));
else else
return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits))); return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits)));
} else { } else {
if ((ld->len - bits) < 32) if ((ld->len - bits) < 32)
{ {

8
libfaad2/cfft_tab.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

2
libfaad2/common.h
View File

@ -34,7 +34,7 @@
extern "C" { extern "C" {
#endif #endif
/* Allow build on cygwin*/ /* Allow build on Cygwin*/
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#define __STRICT_ANSI__ #define __STRICT_ANSI__
#endif #endif

3
libfaad2/faad.h
View File

@ -1,6 +1,6 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** 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 ** 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 ** 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 $ ** $Id: faad.h,v 1.47 2004/04/03 19:08:37 menno Exp $
**/ **/
/* warn people for update */ /* warn people for update */
#pragma message("please update faad2 include filename and function names!") #pragma message("please update faad2 include filename and function names!")

8
libfaad2/mdct_tab.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

8
libfaad2/output.c
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com ** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
** **
** This program is free software; you can redistribute it and/or modify ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

8
libfaad2/ps_dec.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

3
libfaad2/pulse.c
View File

@ -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]; 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]; k += pul->pulse_offset[i];
if (k >= framelen) if (k >= framelen)

8
libfaad2/sbr_dec.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

8
libfaad2/sbr_qmf.c
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

1
libfaad2/sbr_qmf.h
View File

@ -53,3 +53,4 @@ void sbr_qmf_synthesis_64_sse(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHF
} }
#endif #endif
#endif #endif

8
libfaad2/specrec.c
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly

8
libfaad2/structs.h
View File

@ -1,19 +1,19 @@
/* /*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003-2004 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 ** 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 ** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2 of the License, or ** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version. ** (at your option) any later version.
** **
** This program is distributed in the hope that it will be useful, ** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of ** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details. ** GNU General Public License for more details.
** **
** You should have received a copy of the GNU General Public License ** 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. ** 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 ** Any non-GPL usage of this software or parts of this software is strictly