[Ffmpeg-cvslog] CVS: ffmpeg/libavformat avienc.c,1.125,1.126
Benjamin Larsson CVS
banan
Wed Mar 1 08:42:57 CET 2006
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/doc ffmpeg-doc.texi,1.118,1.119
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat mpeg.c, 1.93, 1.94 rm.c, 1.56, 1.57 nut.c, 1.61, 1.62 avidec.c, 1.80, 1.81 utils.c, 1.179, 1.180 avformat.h, 1.144, 1.145 asf.c, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv3422/libavformat
Modified Files:
avienc.c
Log Message:
Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by
kostya shishkov - gmail - com.
Index: avienc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- avienc.c 1 Mar 2006 01:29:12 -0000 1.125
+++ avienc.c 1 Mar 2006 07:42:55 -0000 1.126
@@ -149,6 +149,8 @@
{ CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') },
{ CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
+ { CODEC_ID_MJPEG, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
+ { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
{ CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') },
{ CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') },
{ CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },
- Previous message: [Ffmpeg-cvslog] CVS: ffmpeg/doc ffmpeg-doc.texi,1.118,1.119
- Next message: [Ffmpeg-cvslog] CVS: ffmpeg/libavformat mpeg.c, 1.93, 1.94 rm.c, 1.56, 1.57 nut.c, 1.61, 1.62 avidec.c, 1.80, 1.81 utils.c, 1.179, 1.180 avformat.h, 1.144, 1.145 asf.c, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ffmpeg-cvslog
mailing list