diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-06 21:20:29 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-06 21:20:29 +0000 |
| commit | 28665f4a2ca6dea9eaafba8d2abbd9472bd061db (patch) | |
| tree | 6401e38414451275d48d58b7939dc1feee41178b /include | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| parent | 6255dcb866af030b0122c061459ab587a0d8c074 (diff) | |
| download | xine-lib-28665f4a2ca6dea9eaafba8d2abbd9472bd061db.tar.gz xine-lib-28665f4a2ca6dea9eaafba8d2abbd9472bd061db.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_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 4af718a1b..9401f8852 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -192,6 +192,7 @@ extern "C" { #define BUF_VIDEO_VP6F 0x02630000 #define BUF_VIDEO_THEORA_RAW 0x02640000 #define BUF_VIDEO_VC1 0x02650000 +#define BUF_VIDEO_VMNC 0x02660000 /*@}*/ /** |