avcodec: map Canopus Lossless (CLLC)
authorDaniel Verkamp <daniel@drv.nu>
Sun, 12 Jan 2014 08:15:03 +0000 (01:15 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 12 Jan 2014 15:23:59 +0000 (16:23 +0100)
Sample:
http://fate-suite.libav.org/cllc/sample-cllc-rgb.avi

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index 91c9ee5..aa51a32 100644 (file)
 #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')
index 00056e9..09947dc 100644 (file)
@@ -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
index 17ac24b..1542513 100644 (file)
@@ -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[] = {