vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Jul 8 07:34:22 2011 +0200| [d8a7e2d1c816dabf09ac4b41d721e13dcb51ba02] | committer: Jean-Baptiste Kempf
Support of Lagarith > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8a7e2d1c816dabf09ac4b41d721e13dcb51ba02 --- NEWS | 1 + include/vlc_fourcc.h | 1 + modules/codec/avcodec/fourcc.c | 5 ++++- src/misc/fourcc.c | 3 +++ 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 4743c12..7ad4e29 100644 --- 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 54cc078..8c5b176 100644 --- 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 7690d30..b9d0d73 100644 --- 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 63bfe1d..cea64fe 100644 --- 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[] = { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
