[xine-cvs] HG: xine-lib-codec-support: Add support for ffmpeg's VMWare Screen codec.

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1197304162 0
# Node ID e7bffd817be4c63f2f55caa17bed9f2c04a9b099
# Parent  c7f5a6f841c12a5690439ae23949a1b8529ddf33
Add support for ffmpeg's VMWare Screen codec.

diff -r e7bffd817be4c63f2f55caa17bed9f2c04a9b099 -r c7f5a6f841c12a5690439ae23949a1b8529ddf33 ChangeLog
--- a/ChangeLog	Mon Dec 10 16:29:22 2007 +0000
+++ b/ChangeLog	Sun Dec 09 14:59:38 2007 +0000
@@ -24,7 +24,7 @@ xine-lib (1.1.9) (unreleased)
     buffer.
   * DXR3 encoding with external ffmpeg should be fixed now.
     (This was broken by ffmpeg revision 9283).
-  * Enabled the WMV VC1 (ffmpeg) codec.
+  * Added support for ffmpeg's WMV VC1 and VMWare Screen codecs.
 
 xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
diff -r e7bffd817be4c63f2f55caa17bed9f2c04a9b099 -r c7f5a6f841c12a5690439ae23949a1b8529ddf33 src/libffmpeg/ff_video_decoder.c
--- a/src/libffmpeg/ff_video_decoder.c	Mon Dec 10 16:29:22 2007 +0000
+++ b/src/libffmpeg/ff_video_decoder.c	Sun Dec 09 14:59:38 2007 +0000
@@ -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)"},
 };
 
@@ -1800,6 +1801,9 @@ static uint32_t supported_video_types[] 
   #ifdef CONFIG_CAVS_DECODER
   BUF_VIDEO_CAVS,
   #endif
+  #ifdef CONFIG_VMNC_DECODER
+  BUF_VIDEO_VMNC,
+  #endif
   BUF_VIDEO_THEORA_RAW,
   0 
 };
diff -r e7bffd817be4c63f2f55caa17bed9f2c04a9b099 -r c7f5a6f841c12a5690439ae23949a1b8529ddf33 src/xine-engine/buffer.h
--- a/src/xine-engine/buffer.h	Mon Dec 10 16:29:22 2007 +0000
+++ b/src/xine-engine/buffer.h	Sun Dec 09 14:59:38 2007 +0000
@@ -190,6 +190,7 @@ extern "C" {
 #define BUF_VIDEO_VP6F		0x02630000
 #define BUF_VIDEO_THEORA_RAW	0x02640000
 #define BUF_VIDEO_VC1		0x02650000
+#define BUF_VIDEO_VMNC		0x02660000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
diff -r e7bffd817be4c63f2f55caa17bed9f2c04a9b099 -r c7f5a6f841c12a5690439ae23949a1b8529ddf33 src/xine-engine/buffer_types.c
--- a/src/xine-engine/buffer_types.c	Mon Dec 10 16:29:22 2007 +0000
+++ b/src/xine-engine/buffer_types.c	Sun Dec 09 14:59:38 2007 +0000
@@ -1129,6 +1129,14 @@ static const audio_db_t audio_db[] = {
   BUF_AUDIO_WAVPACK,
   "Wavpack"
 },
+{
+  {
+    ME_FOURCC('V','M','n','c'),
+    0
+  },
+  BUF_VIDEO_VMNC,
+  "VMware Screen Codec"
+},
 { { 0 }, 0, "last entry" }
 };