diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 205b85b841..c4a87d346f 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -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') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index ec634ff827..7cdd839271 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -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 diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index cd020b28b7..24d90ae3a4 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -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"),