diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-09-26 23:27:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-09-26 23:27:22 +0000 |
| commit | 0c2dd16eb65bb0ade97346aabecc4762f6bcac31 (patch) | |
| tree | 3ab7efaa5ba31fd757c4b0a2f95a690397937a2c /libavcodec/avcodec.h | |
| parent | 7f2bdb62d48886c62aadfdf0c1890a44d935c56d (diff) | |
| download | ffmpeg-0c2dd16eb65bb0ade97346aabecc4762f6bcac31.tar.gz | |
autodetect UMP4 (by adding a fourcc field to AVCodecContext)
Originally committed as revision 974 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 85a9d9a92f..0d2c342550 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 4627 -#define LIBAVCODEC_BUILD_STR "4627" +#define LIBAVCODEC_BUILD 4628 +#define LIBAVCODEC_BUILD_STR "4628" enum CodecID { CODEC_ID_NONE, @@ -675,6 +675,14 @@ typedef struct AVCodecContext { * decoding: unused */ float dark_masking; + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A') + * this is used to workaround some encoder bugs + * encoding: unused + * decoding: set by user + */ + int fourcc; //FIXME this should be reordered after kabis API is finished ... //TODO kill kabi |