diff options
| author | Arpi <arpi@thot.banki.hu> | 2002-05-01 18:12:04 +0000 |
|---|---|---|
| committer | Arpi <arpi@thot.banki.hu> | 2002-05-01 18:12:04 +0000 |
| commit | e84c31dc88c883ca85d4ce52bcb882779695b861 (patch) | |
| tree | 18a9f428f1ebd817281f7fcc8ef94303c6ccca92 /libavcodec/avcodec.h | |
| parent | 2a2a98c0d19f8f86876b7f65671d3c9d700385bb (diff) | |
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
Originally committed as revision 429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 67a663ed36..f8c520bce6 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 4604 -#define LIBAVCODEC_BUILD_STR "4604" +#define LIBAVCODEC_BUILD 4605 +#define LIBAVCODEC_BUILD_STR "4605" enum CodecID { CODEC_ID_NONE, @@ -93,6 +93,7 @@ static const int Motion_Est_QTab[] = { 1, 4, 3, 6, 5, 2 }; #define CODEC_FLAG_INPUT_PRESERVED 0x0100 #define CODEC_FLAG_PASS1 0x0200 /* use internal 2pass ratecontrol in first pass mode */ #define CODEC_FLAG_PASS2 0x0400 /* use internal 2pass ratecontrol in second pass mode */ +#define CODEC_FLAG_EXTERN_HUFF 0x1000 /* use external huffman table (for mjpeg) */ /* codec capabilities */ @@ -110,6 +111,12 @@ typedef struct AVCodecContext { int me_method; /* ME algorithm used for video coding */ + /* extra data from parent application to codec, e.g. huffman table + for mjpeg */ + /* the parent should allocate and free this buffer */ + void *extradata; + int extradata_size; + /* video only */ int frame_rate; /* frames per sec multiplied by FRAME_RATE_BASE */ int width, height; |