diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:26:57 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-09 05:26:57 +0000 |
| commit | 839f1c05e75c6f0ea8a96a7994c27445f2db4e2e (patch) | |
| tree | 57f7b0fe9f1726b7ae44b3d6789e604665ed1ef1 /src/libffmpeg/ff_video_decoder.c | |
| parent | 18425f7e1c44a3d9280cbc6f9220032c4077dd25 (diff) | |
| parent | be63e939873fc1865c763e598e2407f23ce67246 (diff) | |
| download | xine-lib-839f1c05e75c6f0ea8a96a7994c27445f2db4e2e.tar.gz xine-lib-839f1c05e75c6f0ea8a96a7994c27445f2db4e2e.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/libffmpeg/ff_video_decoder.c')
| -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 0f63df738..df0973030 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -243,6 +243,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)"}, @@ -1595,6 +1596,9 @@ static uint32_t supported_video_types[] = { #if defined(HAVE_FFMPEG) || CONFIG_WMV3_DECODER BUF_VIDEO_WMV9, #endif +#if defined(HAVE_FFMPEG) || CONFIG_VC1_DECODER + BUF_VIDEO_VC1, +#endif #if defined(HAVE_FFMPEG) || CONFIG_MPEG4_DECODER BUF_VIDEO_MPEG4, #endif |