[vlc-commits] Support of Mxpeg codec

[Sébastien Escudier]

vlc/vlc-2.0 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Fri Feb 10 15:14:26 2012 +0100| [d192cba00acec14647518a0b5c81f1734bbc9bf1] | committer: Sébastien Escudier

Support of Mxpeg codec
(cherry picked from commit a6fdd02e3b952dc2f66469cc4bd5e0b7ec1116f4)

Signed-off-by: Sébastien Escudier <sebastien-devel at celeos.eu>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d192cba00acec14647518a0b5c81f1734bbc9bf1
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    4 ++++
 src/misc/fourcc.c              |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 4aa46a5..b3a9b1c 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -119,6 +119,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 ccccb2f..e595b10 100644
--- 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 f98c4bd..97c99ed 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -897,6 +897,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[] = {