summaryrefslogtreecommitdiff
path: root/include/xine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-08 01:00:10 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-08 01:00:10 +0100
commit628c4cbd9d023e74a7c6805d7ec0f163f2c172d1 (patch)
treeb74ddd76dc7fb3080ea269c6d3776f84aca36837 /include/xine
parent3f255412a55880c7323debef2bff0fc2dd5ed554 (diff)
parent964f55aef546a1f1574c9f6ec10b3410fe390c34 (diff)
downloadxine-lib-628c4cbd9d023e74a7c6805d7ec0f163f2c172d1.tar.gz
xine-lib-628c4cbd9d023e74a7c6805d7ec0f163f2c172d1.tar.bz2
Merge from 1.1.
--HG-- rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/libmad/xine_mad_decoder.c => src/audio_dec/xine_mad_decoder.c rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
Diffstat (limited to 'include/xine')
-rw-r--r--include/xine/buffer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h
index 9401f8852..a53b99db3 100644
--- a/include/xine/buffer.h
+++ b/include/xine/buffer.h
@@ -264,6 +264,7 @@ extern "C" {
#define BUF_AUDIO_SMACKER 0x033B0000
#define BUF_AUDIO_FLVADPCM 0x033C0000
#define BUF_AUDIO_WAVPACK 0x033D0000
+#define BUF_AUDIO_MP3ADU 0x033E0000
/*@}*/
/**