diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
| commit | 35b16971490c92f53cb5264e68ba67fb7352629a (patch) | |
| tree | 5a17a0bc2f6abfae1d802e094c07b5b72aaa6d00 /include | |
| parent | b70e34352e304cf03da32b688d84eec3c3ffacec (diff) | |
| parent | f1382ea01b368dc1d8044b368f602aad87f6468e (diff) | |
| download | xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.gz xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/buffer.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 11d9e3730..5d1889012 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -39,6 +39,7 @@ extern "C" { #include "config.h" #endif +#include <string.h> #include <stdio.h> #include <pthread.h> #include <sys/types.h> @@ -193,6 +194,7 @@ extern "C" { #define BUF_VIDEO_THEORA_RAW 0x02640000 #define BUF_VIDEO_VC1 0x02650000 #define BUF_VIDEO_VMNC 0x02660000 +#define BUF_VIDEO_SNOW 0x02670000 /*@}*/ /** @@ -265,6 +267,8 @@ extern "C" { #define BUF_AUDIO_FLVADPCM 0x033C0000 #define BUF_AUDIO_WAVPACK 0x033D0000 #define BUF_AUDIO_MP3ADU 0x033E0000 +#define BUF_AUDIO_AMR_NB 0x033F0000 +#define BUF_AUDIO_AMR_WB 0x03400000 /*@}*/ /** @@ -708,6 +712,10 @@ void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED; /** Convert xine_waveformatex struct from little endian */ void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; +static inline _x_is_fourcc(void *ptr, void *tag) { + return memcmp(ptr, tag, 4) == 0; +} + #ifdef __cplusplus } #endif |