diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2004-11-28 18:29:38 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2004-11-28 18:29:38 +0000 |
| commit | f37b9768f64f859c67b8592eca618c5d82509025 (patch) | |
| tree | 197ab0b87440b44e8d0f07590bc97b436687f3d6 /libavcodec/avcodec.h | |
| parent | 17179d2d970cae6d81074f8de204764072bcd791 (diff) | |
split ffhuffyuv into 2 codecs:
"huffyuv" is compatible with the official version
"ffvhuff" contains our improvements
Originally committed as revision 3720 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a2c633bfea..bbc3cedf1f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -17,7 +17,7 @@ extern "C" { #define FFMPEG_VERSION_INT 0x000409 #define FFMPEG_VERSION "0.4.9-pre1" -#define LIBAVCODEC_BUILD 4733 +#define LIBAVCODEC_BUILD 4734 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION FFMPEG_VERSION @@ -99,6 +99,7 @@ enum CodecID { CODEC_ID_PGM, CODEC_ID_PGMYUV, CODEC_ID_PAM, + CODEC_ID_FFVHUFF, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, @@ -1816,6 +1817,7 @@ extern AVCodec msmpeg4v3_encoder; extern AVCodec wmv1_encoder; extern AVCodec wmv2_encoder; extern AVCodec huffyuv_encoder; +extern AVCodec ffvhuff_encoder; extern AVCodec h264_encoder; extern AVCodec asv1_encoder; extern AVCodec asv2_encoder; @@ -1858,6 +1860,7 @@ extern AVCodec mp3_decoder; extern AVCodec mace3_decoder; extern AVCodec mace6_decoder; extern AVCodec huffyuv_decoder; +extern AVCodec ffvhuff_decoder; extern AVCodec oggvorbis_decoder; extern AVCodec cyuv_decoder; extern AVCodec h264_decoder; |