diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 1 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 10 |
4 files changed, 16 insertions, 0 deletions
@@ -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 --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 1e32ad3a6..cceb96bf0 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -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 --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index b08960e7d..35ab1e620 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -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 --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 129d8d194..ee50e5391 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'), |