diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-23 22:46:49 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-23 22:46:49 +0000 |
| commit | 45ce973f67de950ba14bd691b12c94cec9cd7e9f (patch) | |
| tree | d6854758190b9e9ad80771b12f6fcf12daf27d51 /include | |
| parent | 2241baa294539a33d8bc6137e633bb4c93c22b4e (diff) | |
| parent | 7d4c68e4ba6932bfd300a9dc12d7e11b9cfb555d (diff) | |
| download | xine-lib-45ce973f67de950ba14bd691b12c94cec9cd7e9f.tar.gz xine-lib-45ce973f67de950ba14bd691b12c94cec9cd7e9f.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/buffer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index daf6c5ee9..1a51da6c3 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -238,7 +238,8 @@ extern "C" { #define BUF_AUDIO_14_4 0x03230000 #define BUF_AUDIO_28_8 0x03240000 #define BUF_AUDIO_SIPRO 0x03250000 -#define BUF_AUDIO_WMAV3 0x03260000 +#define BUF_AUDIO_WMAPRO 0x03260000 +#define BUF_AUDIO_WMAV3 BUF_AUDIO_WMAPRO #define BUF_AUDIO_INTERPLAY 0x03270000 #define BUF_AUDIO_XA_ADPCM 0x03280000 #define BUF_AUDIO_WESTWOOD 0x03290000 |