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@videolan.org>

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index dc6752e0d7f84557b835b5e07efa49d6cbef446f..3f108bf1dbf01abe14a809c235df247ef27a3c15 100644 (file)
--- 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 3107d82b961f1a3db2682de0ebe6c4e8e5325370..28fc1428f171331acc54474265adf499f94469ba 100644 (file)
--- 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 5497de54a8cebcd62b9d9e79ca823484f91e1349..ba600a2e8d4e4ef4f65f7017d2b8e9b7cde39099 100644 (file)
--- 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[] = {