Commit 81758ac0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Try to decode WMVP with lavc WMV3's decoder

parent b737cab7
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#define VLC_CODEC_WMV2 VLC_FOURCC('W','M','V','2') #define VLC_CODEC_WMV2 VLC_FOURCC('W','M','V','2')
#define VLC_CODEC_WMV3 VLC_FOURCC('W','M','V','3') #define VLC_CODEC_WMV3 VLC_FOURCC('W','M','V','3')
#define VLC_CODEC_WMVA VLC_FOURCC('W','M','V','A') #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_VC1 VLC_FOURCC('V','C','-','1')
#define VLC_CODEC_THEORA VLC_FOURCC('t','h','e','o') #define VLC_CODEC_THEORA VLC_FOURCC('t','h','e','o')
#define VLC_CODEC_TARKIN VLC_FOURCC('t','a','r','k') #define VLC_CODEC_TARKIN VLC_FOURCC('t','a','r','k')
......
...@@ -89,6 +89,9 @@ static const struct ...@@ -89,6 +89,9 @@ static const struct
{ VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES }, { VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES },
{ VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES }, { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES },
{ VLC_CODEC_WMV3, CODEC_ID_WMV3, 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_VC1, CODEC_ID_VC1, VIDEO_ES },
{ VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES }, { VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES },
......
...@@ -392,6 +392,10 @@ static const entry_t p_list_video[] = { ...@@ -392,6 +392,10 @@ static const entry_t p_list_video[] = {
A("vc-1"), A("vc-1"),
A("VC-1"), A("VC-1"),
B(VLC_CODEC_WMVP, "Windows Media Video Presentation"),
A("WMVP"),
A("wmvp"),
/* Microsoft Video 1 */ /* Microsoft Video 1 */
B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"), B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"),
A("MSVC"), A("MSVC"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment