[xine-cvs] HG: xine-lib: Enable the WMV VC1 (ffmpeg) codec.

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

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1197177123 0
# Node ID b9d8d256fe2210d1a003f37a6380640a363a83bb
# Parent  9828a86fdedbd210d461046bc70ce3aa0c4e602a
Enable the WMV VC1 (ffmpeg) codec.

diff -r b9d8d256fe2210d1a003f37a6380640a363a83bb -r 9828a86fdedbd210d461046bc70ce3aa0c4e602a ChangeLog
--- a/ChangeLog	Sun Dec 09 05:12:03 2007 +0000
+++ b/ChangeLog	Sat Dec 08 01:33:23 2007 +0000
@@ -24,6 +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.
 
 xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
diff -r b9d8d256fe2210d1a003f37a6380640a363a83bb -r 9828a86fdedbd210d461046bc70ce3aa0c4e602a src/libffmpeg/ff_video_decoder.c
--- a/src/libffmpeg/ff_video_decoder.c	Sun Dec 09 05:12:03 2007 +0000
+++ b/src/libffmpeg/ff_video_decoder.c	Sat Dec 08 01:33:23 2007 +0000
@@ -245,6 +245,7 @@ static const ff_codec_t ff_video_lookup[
   {BUF_VIDEO_WMV7,        CODEC_ID_WMV1,      "MS Windows Media Video 7 (ffmpeg)"},
   {BUF_VIDEO_WMV8,        CODEC_ID_WMV2,      "MS Windows Media Video 8 (ffmpeg)"},
   {BUF_VIDEO_WMV9,        CODEC_ID_WMV3,      "MS Windows Media Video 9 (ffmpeg)"},
+  {BUF_VIDEO_VC1,         CODEC_ID_VC1,       "MS Windows Media Video VC-1 (ffmpeg)"},
   {BUF_VIDEO_MPEG4,       CODEC_ID_MPEG4,     "ISO MPEG-4 (ffmpeg)"},
   {BUF_VIDEO_XVID,        CODEC_ID_MPEG4,     "ISO MPEG-4 (XviD, ffmpeg)"},
   {BUF_VIDEO_DIVX5,       CODEC_ID_MPEG4,     "ISO MPEG-4 (DivX5, ffmpeg)"},
@@ -1597,6 +1598,9 @@ static uint32_t supported_video_types[] 
   #ifdef CONFIG_WMV3_DECODER
   BUF_VIDEO_WMV9,
   #endif
+  #ifdef CONFIG_VC1_DECODER
+  BUF_VIDEO_VC1,
+  #endif
   #ifdef CONFIG_MPEG4_DECODER
   BUF_VIDEO_MPEG4,
   #endif
diff -r b9d8d256fe2210d1a003f37a6380640a363a83bb -r 9828a86fdedbd210d461046bc70ce3aa0c4e602a src/xine-engine/buffer.h
--- a/src/xine-engine/buffer.h	Sun Dec 09 05:12:03 2007 +0000
+++ b/src/xine-engine/buffer.h	Sat Dec 08 01:33:23 2007 +0000
@@ -189,6 +189,7 @@ extern "C" {
 #define BUF_VIDEO_CAVS		0x02620000
 #define BUF_VIDEO_VP6F		0x02630000
 #define BUF_VIDEO_THEORA_RAW	0x02640000
+#define BUF_VIDEO_VC1		0x02650000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
diff -r b9d8d256fe2210d1a003f37a6380640a363a83bb -r 9828a86fdedbd210d461046bc70ce3aa0c4e602a src/xine-engine/buffer_types.c
--- a/src/xine-engine/buffer_types.c	Sun Dec 09 05:12:03 2007 +0000
+++ b/src/xine-engine/buffer_types.c	Sat Dec 08 01:33:23 2007 +0000
@@ -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'),