Try to decode WMVP with lavc WMV3's decoder

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 28acd1ea6bca563588c916aea45a73632bf74359..b5e0bb9a8c54be9864cc57800cbf6a16c92da318 100644 (file)
--- 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 0239ef0d7b1988c5b103a791730d0d7d0127127e..45c4b93985e80a538446bd84421f7a1bd8797997 100644 (file)
--- 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 1a392fae304e2be9c53756bcc99b3d2516756e16..f7247967157b25c183805550dbdc086dba450a6a 100644 (file)
--- 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"),