diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-10-13 13:16:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-10-13 13:16:04 +0000 |
| commit | 4d2858deac5213eaddfdc06f98379b6325d7b953 (patch) | |
| tree | 9ab96559f7e8ac0037046c3129dd8a2654e76a2c /libavcodec/avcodec.h | |
| parent | 46de8b7334281ed1e15c0902a56cef8da7b4f296 (diff) | |
| download | ffmpeg-4d2858deac5213eaddfdc06f98379b6325d7b953.tar.gz | |
better/cleaner error resilience (done in a 2nd pass after decoding)
h263/mpeg4 out of order slice decoding
Originally committed as revision 1030 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5a3dbd8f4d..e9a5acda99 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 4630 -#define LIBAVCODEC_BUILD_STR "4630" +#define LIBAVCODEC_BUILD 4631 +#define LIBAVCODEC_BUILD_STR "4631" enum CodecID { CODEC_ID_NONE, @@ -414,12 +414,19 @@ typedef struct AVCodecContext { unsigned int codec_tag; /* codec tag, only used if unknown codec */ /** - * workaround bugs in encoders which cannot be detected automatically + * workaround bugs in encoders which sometimes cannot be detected automatically * encoding: unused * decoding: set by user */ int workaround_bugs; - +#define FF_BUG_AUTODETECT 1 //autodetection +#define FF_BUG_OLD_MSMPEG4 2 +#define FF_BUG_XVID_ILACE 4 +#define FF_BUG_UMP4 8 +#define FF_BUG_NO_PADDING 16 +#define FF_BUG_AC_VLC 32 +//#define FF_BUG_FAKE_SCALABILITY 16 //autodetection should work 100% + /** * encoding: set by user * decoding: unused @@ -715,6 +722,15 @@ typedef struct AVCodecContext { */ int *slice_offset; + /** + * error concealment flags + * encoding: unused + * decoding: set by user + */ + int error_concealment; +#define FF_EC_GUESS_MVS 1 +#define FF_EC_DEBLOCK 2 + //FIXME this should be reordered after kabis API is finished ... //TODO kill kabi /* |