diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-14 19:20:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-14 19:20:04 +0000 |
| commit | 11f18fafcab80ef52391e6e29c5a1a8f6f22c4e3 (patch) | |
| tree | 536c67a677f6aecf343d85251f933e7ab1885885 /libavcodec/avcodec.h | |
| parent | 5844544064d18f0fc738a5849b1c3b4a0ec8022a (diff) | |
| download | ffmpeg-11f18fafcab80ef52391e6e29c5a1a8f6f22c4e3.tar.gz | |
huffyuv
Originally committed as revision 1211 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3e7bb468d3..8ca71a0bcf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5,8 +5,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4638 -#define LIBAVCODEC_BUILD_STR "4638" +#define LIBAVCODEC_BUILD 4639 +#define LIBAVCODEC_BUILD_STR "4639" enum CodecID { CODEC_ID_NONE, @@ -34,6 +34,7 @@ enum CodecID { CODEC_ID_WMAV2, CODEC_ID_MACE3, CODEC_ID_MACE6, + CODEC_ID_HUFFYUV, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -770,6 +771,23 @@ typedef struct AVCodecContext { * CPU features (i.e. MMX, SSE. ...) */ unsigned dsp_mask; + + /** + * bits per sample/pixel from the demuxer (needed for huffyuv) + * encoding; set by lavc + * decoding: set by user + */ + int bits_per_sample; + + /** + * prediction method (needed for huffyuv) + * encoding; set by user + * decoding: unused + */ + int prediction_method; +#define FF_PRED_LEFT 0 +#define FF_PRED_PLANE 1 +#define FF_PRED_MEDIAN 2 } AVCodecContext; typedef struct AVCodec { @@ -810,6 +828,7 @@ extern AVCodec msmpeg4v2_encoder; extern AVCodec msmpeg4v3_encoder; extern AVCodec wmv1_encoder; extern AVCodec wmv2_encoder; +extern AVCodec huffyuv_encoder; extern AVCodec h263_decoder; extern AVCodec mpeg4_decoder; @@ -831,6 +850,7 @@ extern AVCodec mp2_decoder; extern AVCodec mp3_decoder; extern AVCodec mace3_decoder; extern AVCodec mace6_decoder; +extern AVCodec huffyuv_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \ |