Commit 090fe825 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Correct WVP2 fourcc and map to avcodec

Should close #4011
parent bdf2ffa1
......@@ -48,6 +48,7 @@
#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_WMVP2 VLC_FOURCC('W','V','P','2')
#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')
......
......@@ -228,6 +228,7 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 9, 0 )
{ VLC_CODEC_WMVP, CODEC_ID_WMV3IMAGE, VIDEO_ES },
{ VLC_CODEC_WMVP2, CODEC_ID_VC1IMAGE, VIDEO_ES },
#endif
#if 0
......
......@@ -393,8 +393,6 @@ static const entry_t p_list_video[] = {
B(VLC_CODEC_WMVA, "Windows Media Video Advanced Profile"),
A("WMVA"),
A("wmva"),
A("WVP2"),
A("wvp2"),
B(VLC_CODEC_VC1, "Windows Media Video VC1"),
A("WVC1"),
......@@ -406,6 +404,10 @@ static const entry_t p_list_video[] = {
A("WMVP"),
A("wmvp"),
B(VLC_CODEC_WMVP2, "Windows Media Video Presentation, v2"),
A("WVP2"),
A("wvp2"),
/* Microsoft Video 1 */
B(VLC_CODEC_MSVIDEO1, "Microsoft Video 1"),
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