Support of Mxpeg codec

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')

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 },

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[] = {