diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-17 22:48:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-17 22:48:51 +0000 |
| commit | b1e6b355f74d544bbfb5f55334141ae13af9fae5 (patch) | |
| tree | acb7843dee11aebc42cf447b27ab24185b2fd446 /libavcodec/avcodec.h | |
| parent | c3b4e0eb150bb3f46d2335c5dc62435accea13cc (diff) | |
| download | ffmpeg-b1e6b355f74d544bbfb5f55334141ae13af9fae5.tar.gz | |
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
Originally committed as revision 1968 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c2017706b7..6daf668c67 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -31,6 +31,7 @@ enum CodecID { CODEC_ID_AC3, CODEC_ID_MJPEG, CODEC_ID_MJPEGB, + CODEC_ID_LJPEG, CODEC_ID_MPEG4, CODEC_ID_RAWVIDEO, CODEC_ID_MSMPEG4V1, @@ -98,7 +99,7 @@ enum PixelFormat { PIX_FMT_BGR24, ///< Packed pixel, 3 bytes per pixel, BGRBGR... PIX_FMT_YUV422P, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) PIX_FMT_YUV444P, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) - PIX_FMT_RGBA32, ///< always stored in cpu endianness + PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... PIX_FMT_YUV410P, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) PIX_FMT_YUV411P, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) PIX_FMT_RGB565, ///< always stored in cpu endianness @@ -1226,6 +1227,7 @@ extern AVCodec h263_encoder; extern AVCodec h263p_encoder; extern AVCodec rv10_encoder; extern AVCodec mjpeg_encoder; +extern AVCodec ljpeg_encoder; extern AVCodec mpeg4_encoder; extern AVCodec msmpeg4v1_encoder; extern AVCodec msmpeg4v2_encoder; |