[vlc-commits] avcodec: map LCL MSZH and ZLIB

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Fri Jan 10 18:00:18 2014 -0700| [19092b0414c63b2a4a246cfbee731869584a112f] | committer: Jean-Baptiste Kempf

avcodec: map LCL MSZH and ZLIB

Samples:
http://samples.mplayerhq.hu/V-codecs/mszh-zlib/monika_mszh.avi
http://samples.mplayerhq.hu/V-codecs/mszh-zlib/monika_zlib.avi

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index dc6752e..3f108bf 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -140,6 +140,8 @@
 #define VLC_CODEC_BINKAUDIO_DCT   VLC_FOURCC('B','A','U','1')
 #define VLC_CODEC_BINKAUDIO_RDFT  VLC_FOURCC('B','A','U','2')
 #define VLC_CODEC_XAN_WC4         VLC_FOURCC('X','x','a','n')
+#define VLC_CODEC_LCL_MSZH        VLC_FOURCC('M','S','Z','H')
+#define VLC_CODEC_LCL_ZLIB        VLC_FOURCC('Z','L','I','B')
 
 /* 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 3107d82..28fc142 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -104,8 +104,8 @@ static const struct
     { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES },
     { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES },
     { VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO, VIDEO_ES },
-    /* AV_CODEC_ID_MSZH */
-    /* AV_CODEC_ID_ZLIB */
+    { VLC_CODEC_LCL_MSZH, AV_CODEC_ID_MSZH, VIDEO_ES },
+    { VLC_CODEC_LCL_ZLIB, AV_CODEC_ID_ZLIB, VIDEO_ES },
     { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE, VIDEO_ES },
     { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC, VIDEO_ES },
     { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI, VIDEO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 5497de5..ba600a2 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1002,6 +1002,12 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_XAN_WC4, "Wing Commander IV Xan video"),
         A("Xxan"),
 
+    B(VLC_CODEC_LCL_MSZH, "Loss-Less Codec Library AVImszh"),
+        A("MSZH"),
+
+    B(VLC_CODEC_LCL_ZLIB, "Loss-Less Codec Library AVIzlib"),
+        A("ZLIB"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {