Support of Mxpeg codec

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 7e1d6ba44361abd36d98ef566e6bae32b8fe0b90..96747be3a29569782d942fb2779c2132f1dc21eb 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -120,6 +120,7 @@
 #define VLC_CODEC_LAGARITH  VLC_FOURCC('L','A','G','S')
 #define VLC_CODEC_FLASHSV2  VLC_FOURCC('F','S','V','2')
 #define VLC_CODEC_PRORES    VLC_FOURCC('a','p','c','n')
+#define VLC_CODEC_MXPEG     VLC_FOURCC('M','X','P','G')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9       VLC_FOURCC('Y','V','U','9')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 17eb87a7dc759da619e664ad83e6b645b7fd5f24..b352d1dbf6742dfd2ae121bae927898fa533918a 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -206,6 +206,10 @@ static const struct
     { VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 117, 0 )
+    { VLC_CODEC_MXPEG, CODEC_ID_MXPEG, VIDEO_ES },
+#endif
+
     /* Videogames Codecs */
 
     { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 4f405b9dabdf1bf4b08b8e9a9746d4a4c1c5aa53..b2d8c951690652919f7c1f369e6cd8e8fa3b5848 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -901,6 +901,9 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_LAGARITH, "Lagarith Lossless"),
         A("LAGS"),
 
+    B(VLC_CODEC_MXPEG, "Mxpeg"),
+        A("MXPG"),
+
     B(0, "")
 };
 static const entry_t p_list_audio[] = {