diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-10-10 16:44:25 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-10-10 16:44:25 +0100 |
| commit | cc623e8e0bbf70ed5a40ba360e1f575af949bbd6 (patch) | |
| tree | 7fa84d613a8abc7075f30f7ea58d4569089b0346 /include | |
| parent | 9fabfc06b3dade2f8012d5605ff244bf46391d2c (diff) | |
| parent | 16a2e010084afeca017005cee5ae6155e69f94c6 (diff) | |
| download | xine-lib-cc623e8e0bbf70ed5a40ba360e1f575af949bbd6.tar.gz xine-lib-cc623e8e0bbf70ed5a40ba360e1f575af949bbd6.tar.bz2 | |
Merge from 1.1, with adaptations and renaming (as needed).
Note that the Matroska and Bluray changes have only been compile-tested.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/buffer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 487e17a93..2a396fa3d 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -280,6 +280,7 @@ extern "C" { #define BUF_SPU_CVD 0x04050000 #define BUF_SPU_OGM 0x04060000 #define BUF_SPU_CMML 0x04070000 +#define BUF_SPU_HDMV 0x04080000 /*@}*/ /** |