summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2005-01-14 15:29:47 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2005-01-14 15:29:47 +0000
commita82b4388c3a814270bbab8ee8bd8fd998da97663 (patch)
tree9e4dca1deb8c044c31ab519cd368727c7efcd77c
parent05f670cb8cb0e0594d85ee50e8d126557cf3f8fe (diff)
downloadxine-lib-a82b4388c3a814270bbab8ee8bd8fd998da97663.tar.gz
xine-lib-a82b4388c3a814270bbab8ee8bd8fd998da97663.tar.bz2
(Drum roll) Long awaited support for Musepack
CVS patchset: 7345 CVS date: 2005/01/14 15:29:47
-rw-r--r--src/xine-engine/buffer.h3
-rw-r--r--src/xine-engine/buffer_types.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index cc6278346..2d645c5fc 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.145 2004/12/12 22:01:30 mroi Exp $
+ * $Id: buffer.h,v 1.146 2005/01/14 15:29:47 jstembridge Exp $
*
*
* contents:
@@ -226,6 +226,7 @@ extern "C" {
#define BUF_AUDIO_VMD 0x03320000
#define BUF_AUDIO_XAN_DPCM 0x03330000
#define BUF_AUDIO_ALAC 0x03340000
+#define BUF_AUDIO_MPC 0x03350000
/* spu buffer types: */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index fffde62cd..8c8c0b656 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.89 2004/11/30 00:40:59 tmattern Exp $
+ * $Id: buffer_types.c,v 1.90 2005/01/14 15:29:51 jstembridge Exp $
*
*
* contents:
@@ -972,6 +972,13 @@ static audio_db_t audio_db[] = {
BUF_AUDIO_ALAC,
"Apple Lossless Audio Codec"
},
+{
+ {
+ 0
+ },
+ BUF_AUDIO_MPC,
+ "Musepack"
+},
{ { 0 }, 0, "last entry" }
};