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/combined/ffmpeg | |
| 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/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index b99046547..b7a5338fc 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -313,6 +313,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_KMVC, CODEC_ID_KMVC, "Karl Morton's Video Codec (ffmpeg)"}, {BUF_VIDEO_FLASHSV, CODEC_ID_FLASHSV, "Flash Screen Video (ffmpeg)"}, {BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"}, + {BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"}, {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"}, }; @@ -1841,6 +1842,9 @@ static const uint32_t supported_video_types[] = { #if defined(HAVE_FFMPEG) || CONFIG_CAVS_DECODER BUF_VIDEO_CAVS, #endif +#if defined(HAVE_FFMPEG) || CONFIG_VMNC_DECODER + BUF_VIDEO_VMNC, +#endif BUF_VIDEO_THEORA_RAW, 0 }; |