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 /src/xine-engine | |
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 'src/xine-engine')
-rw-r--r-- | src/xine-engine/buffer_types.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 08ff194fa..c7b6ae860 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -771,6 +771,14 @@ static const video_db_t video_db[] = { BUF_VIDEO_KMVC, "Karl Morton's Video Codec" }, +{ + { + ME_FOURCC('V','M','n','c'), + 0 + }, + BUF_VIDEO_VMNC, + "VMware Screen Codec" +}, { { 0 }, 0, "last entry" } }; |