[vlc-commits] avcodec: map Canopus Lossless (CLLC)

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Sun Jan 12 01:15:03 2014 -0700| [cf550d148c98f66d8d580fa4a5ddb531dc317c22] | committer: Jean-Baptiste Kempf

avcodec: map Canopus Lossless (CLLC)

Sample:
http://fate-suite.libav.org/cllc/sample-cllc-rgb.avi

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

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 91c9ee5..aa51a32 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -145,6 +145,7 @@
 #define VLC_CODEC_THP             VLC_FOURCC('T','H','P','0')
 #define VLC_CODEC_ESCAPE124       VLC_FOURCC('E','1','2','4')
 #define VLC_CODEC_KGV1            VLC_FOURCC('K','G','V','1')
+#define VLC_CODEC_CLLC            VLC_FOURCC('C','L','L','C')
 
 /* 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 00056e9..09947dc 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -233,7 +233,9 @@ static const struct
 #if LIBAVCODEC_VERSION_CHECK( 54, 20, 0, 37, 100 )
     { VLC_CODEC_MTS2, AV_CODEC_ID_MTS2, VIDEO_ES },
 #endif
-    /* AV_CODEC_ID_CLLC */
+#if LIBAVCODEC_VERSION_CHECK( 54, 24, 0, 47, 100 )
+    { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC, VIDEO_ES },
+#endif
 #if LIBAVCODEC_VERSION_CHECK( 54, 27, 0, 55, 100 )
     { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES },
 #endif
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 17ac24b..1542513 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1017,6 +1017,9 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_KGV1, "Kega Game Video (KGV1)"),
         A("KGV1"),
 
+    B(VLC_CODEC_CLLC, "Canopus Lossless"),
+        A("CLLC"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {