Support of Lagarith

diff --git a/NEWS b/NEWS
index 4743c124213e58376d9d55c9871bfb318e2fef76..7ad4e29727b12678a3bcf0c8029061f3fb575a40 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,7 @@ Codecs:
  * Experimental Hardware decoding using Broadcom CrystalHD cards
  * New module for decoding EBU subtitles (.stl)
  * Support for 9bits and 10bits H.264/AVC decoding
+ * Support for Lagarith Lossless video codec
 
 Demuxers:
  * New images demuxer supporting jpeg, png, targa, xcf, git, tiff, bmp, pcx, lbm

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 54cc0781c3b5b7bfbd869909c922d23bedefbbe1..8c5b1767d091041f8cd3ce1d7a822b3e16994756 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -116,6 +116,7 @@
 #define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_VP8       VLC_FOURCC('V','P','8','0')
 #define VLC_CODEC_JPEG2000  VLC_FOURCC('J','P','2','K')
+#define VLC_CODEC_LAGARITH  VLC_FOURCC('L','A','G','S')
 
 
 /* Planar YUV 4:1:0 Y:V:U */

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 7690d30ab6ace15d9fada4037cf0a4f0f5191ff7..b9d0d73895065337473b2a277751c22bac3ee3aa 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -202,6 +202,10 @@ static const struct
     { VLC_CODEC_VP8, CODEC_ID_VP8, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 108, 2 )
+    { VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES },
+#endif
+
     /* Videogames Codecs */
 
     { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
@@ -218,7 +222,6 @@ static const struct
 
     { VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
 
-
 #if 0
 /*    UNTESTED VideoGames*/
     { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 63bfe1da631b1a058054b041b3bce7565a0d3155..cea64fe5af3c461a19f1084976e192a541045121 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -835,6 +835,9 @@ static const entry_t p_list_video[] = {
         A("MJP2"),
         A("MJ2C"),
 
+    B(VLC_CODEC_LAGARITH, "Lagarith Lossless"),
+        A("LAGS"),
+
     B(0, "")
 };
 static const entry_t p_list_audio[] = {