diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:26:57 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:26:57 +0000 |
| commit | 839f1c05e75c6f0ea8a96a7994c27445f2db4e2e (patch) | |
| tree | 57f7b0fe9f1726b7ae44b3d6789e604665ed1ef1 /src/xine-engine | |
| parent | 18425f7e1c44a3d9280cbc6f9220032c4077dd25 (diff) | |
| parent | be63e939873fc1865c763e598e2407f23ce67246 (diff) | |
| download | xine-lib-839f1c05e75c6f0ea8a96a7994c27445f2db4e2e.tar.gz xine-lib-839f1c05e75c6f0ea8a96a7994c27445f2db4e2e.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.h | 1 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 20579f12d..ce209c9da 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -196,6 +196,7 @@ extern "C" { #define BUF_VIDEO_CAVS 0x02620000 #define BUF_VIDEO_VP6F 0x02630000 #define BUF_VIDEO_THEORA_RAW 0x02640000 +#define BUF_VIDEO_VC1 0x02650000 /*@}*/ /** diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 827394374..eece2df90 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -318,6 +318,16 @@ static const video_db_t video_db[] = { }, { { + ME_FOURCC('W','V','C','1'), + ME_FOURCC('W','M','V','A'), + ME_FOURCC('v','c','-','1'), + 0 + }, + BUF_VIDEO_VC1, + "Windows Media Video VC-1" +}, +{ + { ME_FOURCC('c','r','a','m'), ME_FOURCC('C','R','A','M'), ME_FOURCC('M','S','V','C'), |