aboutsummaryrefslogtreecommitdiff
path: root/audio/decoders
diff options
context:
space:
mode:
authorMatthew Hoops2011-05-18 18:23:37 -0400
committerMatthew Hoops2011-05-18 18:23:37 -0400
commitd4c92983920cfe3b25a22d91e12c750e591b917e (patch)
treec0b63318b9ba0e67528337cfaa21515def1c3962 /audio/decoders
parent7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff)
parentcf107e24be28c7e6db65b5c7ffed120af4a7994b (diff)
downloadscummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz
scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2
scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'audio/decoders')
-rw-r--r--audio/decoders/adpcm.cpp3
-rw-r--r--audio/decoders/adpcm.h3
-rw-r--r--audio/decoders/adpcm_intern.h3
-rw-r--r--audio/decoders/aiff.cpp3
-rw-r--r--audio/decoders/aiff.h3
-rw-r--r--audio/decoders/flac.cpp3
-rw-r--r--audio/decoders/flac.h3
-rw-r--r--audio/decoders/iff_sound.cpp3
-rw-r--r--audio/decoders/iff_sound.h3
-rw-r--r--audio/decoders/mac_snd.cpp3
-rw-r--r--audio/decoders/mac_snd.h3
-rw-r--r--audio/decoders/mp3.cpp3
-rw-r--r--audio/decoders/mp3.h3
-rw-r--r--audio/decoders/raw.cpp3
-rw-r--r--audio/decoders/raw.h3
-rw-r--r--audio/decoders/vag.cpp3
-rw-r--r--audio/decoders/vag.h3
-rw-r--r--audio/decoders/voc.cpp3
-rw-r--r--audio/decoders/voc.h3
-rw-r--r--audio/decoders/vorbis.cpp3
-rw-r--r--audio/decoders/vorbis.h4
-rw-r--r--audio/decoders/wave.cpp3
-rw-r--r--audio/decoders/wave.h3
23 files changed, 1 insertions, 69 deletions
diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp
index a9284973d5..d28ed222a5 100644
--- a/audio/decoders/adpcm.cpp
+++ b/audio/decoders/adpcm.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/stream.h"
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h
index 10344101e2..1dd4d510df 100644
--- a/audio/decoders/adpcm.h
+++ b/audio/decoders/adpcm.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/adpcm_intern.h b/audio/decoders/adpcm_intern.h
index f875bd88c7..c9f894fb84 100644
--- a/audio/decoders/adpcm_intern.h
+++ b/audio/decoders/adpcm_intern.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index 957fb13638..f3b0dfb559 100644
--- a/audio/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/audio/decoders/aiff.h b/audio/decoders/aiff.h
index dddbffb520..558a018f57 100644
--- a/audio/decoders/aiff.h
+++ b/audio/decoders/aiff.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/flac.cpp b/audio/decoders/flac.cpp
index fe15877ac6..b818d4f7e9 100644
--- a/audio/decoders/flac.cpp
+++ b/audio/decoders/flac.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Disable symbol overrides for FILE as that is used in FLAC headers
diff --git a/audio/decoders/flac.h b/audio/decoders/flac.h
index 69222f22a1..3182b26425 100644
--- a/audio/decoders/flac.h
+++ b/audio/decoders/flac.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/iff_sound.cpp b/audio/decoders/iff_sound.cpp
index 8efe017e75..4efdce0338 100644
--- a/audio/decoders/iff_sound.cpp
+++ b/audio/decoders/iff_sound.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/iff_sound.h"
diff --git a/audio/decoders/iff_sound.h b/audio/decoders/iff_sound.h
index 4d26b32e71..b266e629a1 100644
--- a/audio/decoders/iff_sound.h
+++ b/audio/decoders/iff_sound.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/mac_snd.cpp b/audio/decoders/mac_snd.cpp
index fc69988860..43253a9ddf 100644
--- a/audio/decoders/mac_snd.cpp
+++ b/audio/decoders/mac_snd.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/audio/decoders/mac_snd.h b/audio/decoders/mac_snd.h
index bf6331a265..cbbd82bbe0 100644
--- a/audio/decoders/mac_snd.h
+++ b/audio/decoders/mac_snd.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/mp3.cpp b/audio/decoders/mp3.cpp
index 91bd49873a..8d7f006ec7 100644
--- a/audio/decoders/mp3.cpp
+++ b/audio/decoders/mp3.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/mp3.h"
diff --git a/audio/decoders/mp3.h b/audio/decoders/mp3.h
index d3a5b70d45..86ddc599ea 100644
--- a/audio/decoders/mp3.h
+++ b/audio/decoders/mp3.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/raw.cpp b/audio/decoders/raw.cpp
index cf787f9b12..4789fd0f36 100644
--- a/audio/decoders/raw.cpp
+++ b/audio/decoders/raw.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/endian.h"
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index 23ed02182d..5a7897b688 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#ifndef SOUND_RAW_H
diff --git a/audio/decoders/vag.cpp b/audio/decoders/vag.cpp
index 2c3a36202a..10ef69708c 100644
--- a/audio/decoders/vag.cpp
+++ b/audio/decoders/vag.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "audio/decoders/vag.h"
diff --git a/audio/decoders/vag.h b/audio/decoders/vag.h
index 4adc1d3dde..b80fbdb98f 100644
--- a/audio/decoders/vag.h
+++ b/audio/decoders/vag.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/voc.cpp b/audio/decoders/voc.cpp
index 9c2dc4f337..74ea4440a1 100644
--- a/audio/decoders/voc.cpp
+++ b/audio/decoders/voc.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/debug.h"
diff --git a/audio/decoders/voc.h b/audio/decoders/voc.h
index 38250dcf7a..8bc6dcf46f 100644
--- a/audio/decoders/voc.h
+++ b/audio/decoders/voc.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
diff --git a/audio/decoders/vorbis.cpp b/audio/decoders/vorbis.cpp
index 63f7ba8207..2724dd1f02 100644
--- a/audio/decoders/vorbis.cpp
+++ b/audio/decoders/vorbis.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
// Disable symbol overrides for FILE and fseek as those are used in the
diff --git a/audio/decoders/vorbis.h b/audio/decoders/vorbis.h
index 51d0b82d5f..e3d989e9b8 100644
--- a/audio/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
@@ -36,6 +33,7 @@
* - scumm
* - sword1
* - sword2
+ * - sword25
* - touche
* - tucker
*/
diff --git a/audio/decoders/wave.cpp b/audio/decoders/wave.cpp
index a64874887a..3cf4566d0c 100644
--- a/audio/decoders/wave.cpp
+++ b/audio/decoders/wave.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
#include "common/debug.h"
diff --git a/audio/decoders/wave.h b/audio/decoders/wave.h
index 33c3e798a0..6a34bc175a 100644
--- a/audio/decoders/wave.h
+++ b/audio/decoders/wave.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/**
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 08:57:01 +0000