diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-09-10 23:40:55 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-09-10 23:40:55 +0000 |
| commit | 541ae14095cf7757bc5034a6d09f9a41e385802d (patch) | |
| tree | 96e12e8bdbcb311ddf8e6ae02c98e7186e9488e7 /libavcodec/avcodec.h | |
| parent | cb0c448a8d026fe7fec546837d87e5d258f42123 (diff) | |
| download | ffmpeg-541ae14095cf7757bc5034a6d09f9a41e385802d.tar.gz | |
AVI stream header FCC / more reliable detection of old xvid files
Originally committed as revision 2258 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 8d5b30c62a..4088c978c0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,8 +15,8 @@ extern "C" { #define LIBAVCODEC_VERSION_INT 0x000408 #define LIBAVCODEC_VERSION "0.4.8" -#define LIBAVCODEC_BUILD 4678 -#define LIBAVCODEC_BUILD_STR "4678" +#define LIBAVCODEC_BUILD 4679 +#define LIBAVCODEC_BUILD_STR "4679" #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR @@ -1219,6 +1219,13 @@ typedef struct AVCodecContext { */ uint16_t *inter_matrix; + /** + * fourcc from the AVI stream header (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, will be converted to upper case by lavc during init + */ + unsigned int stream_codec_tag; } AVCodecContext; |