summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.h3
-rw-r--r--src/xine-engine/buffer_types.c10
2 files changed, 11 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index e1683c122..99402d53b 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.70 2002/10/04 04:55:43 tmmm Exp $
+ * $Id: buffer.h,v 1.71 2002/10/12 19:18:48 tmmm Exp $
*
*
* contents:
@@ -163,6 +163,7 @@ extern "C" {
#define BUF_AUDIO_VQA_IMA 0x031B0000
#define BUF_AUDIO_MULAW 0x031C0000
#define BUF_AUDIO_ALAW 0x031D0000
+#define BUF_AUDIO_GSM610 0x031E0000
/* spu buffer types: */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 3c96b921e..ef5288694 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer_types.c,v 1.42 2002/10/04 02:27:00 tmmm Exp $
+ * $Id: buffer_types.c,v 1.43 2002/10/12 19:18:48 tmmm Exp $
*
*
* contents:
@@ -680,6 +680,14 @@ static audio_db_t audio_db[] = {
BUF_AUDIO_ALAW,
"A-law logarithmic PCM"
},
+{
+ {
+ meFOURCC('a', 'g', 's', 'm'),
+ 0
+ },
+ BUF_AUDIO_GSM610,
+ "GSM 6.10"
+},
{ { 0 }, 0, "last entry" }
};