vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Mon Dec 20 01:28:29 2010 +0100| [81758ac018435e0919c9b82f52a6a94e672de839] | committer: Jean-Baptiste Kempf
Try to decode WMVP with lavc WMV3's decoder > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=81758ac018435e0919c9b82f52a6a94e672de839 --- include/vlc_fourcc.h | 1 + modules/codec/avcodec/fourcc.c | 3 +++ src/misc/fourcc.c | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 28acd1e..b5e0bb9 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -48,6 +48,7 @@ #define VLC_CODEC_WMV2 VLC_FOURCC('W','M','V','2') #define VLC_CODEC_WMV3 VLC_FOURCC('W','M','V','3') #define VLC_CODEC_WMVA VLC_FOURCC('W','M','V','A') +#define VLC_CODEC_WMVP VLC_FOURCC('W','M','V','P') #define VLC_CODEC_VC1 VLC_FOURCC('V','C','-','1') #define VLC_CODEC_THEORA VLC_FOURCC('t','h','e','o') #define VLC_CODEC_TARKIN VLC_FOURCC('t','a','r','k') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 0239ef0..45c4b93 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -89,6 +89,9 @@ static const struct { VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES }, { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES }, { VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES }, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 90, 1 ) + { VLC_CODEC_WMVP, CODEC_ID_WMV3, VIDEO_ES }, +#endif { VLC_CODEC_VC1, CODEC_ID_VC1, VIDEO_ES }, { VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES }, diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 1a392fa..f724796 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -392,6 +392,10 @@ static const entry_t p_list_video[] = { A("vc-1"), A("VC-1"), + B(VLC_CODEC_WMVP, "Windows Media Video Presentation"), + A("WMVP"), + A("wmvp"), + /* Microsoft Video 1 */ B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"), A("MSVC"), _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits