diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:12:03 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:12:03 +0000 |
| commit | be63e939873fc1865c763e598e2407f23ce67246 (patch) | |
| tree | 15c00af92fcd8ca7c31bed2bb7a4c88abcd9dfee /src/libffmpeg | |
| parent | 17db1541ed0d981b41a62a4fef080cb188990d5c (diff) | |
| download | xine-lib-be63e939873fc1865c763e598e2407f23ce67246.tar.gz xine-lib-be63e939873fc1865c763e598e2407f23ce67246.tar.bz2 | |
Enable the WMV VC1 (ffmpeg) codec.
--HG--
extra : transplant_source : %15%CD%0B%2C%F2g%03%B9%25%D4%B2%8BQ%1F%EB%BB%8F%28%9B%C8
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 |