diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 01:32:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 02:08:59 +0200 |
| commit | 70d9fb696393277247101da47e67d568a6aea4d9 (patch) | |
| tree | adba052f93445216b060f2afd0dbefd76644d84a /libavcodec/avcodec.h | |
| parent | 35674a29b7f6cff70e3998b5d90feb693c817196 (diff) | |
| parent | d97ca425efeb468bc8e9db891385a909883177bb (diff) | |
| download | ffmpeg-70d9fb696393277247101da47e67d568a6aea4d9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sunrast: Check for out of bounds reads
lavc: rename AV_ER_* options to AV_EF_* and rename AGGRESSIVE to BUFFER
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Add libvpx presets.
doc/avtools: add forgotten part to stream specifiers description
swscale: prevent overflow during initialization
g722: Add a fate test for the encoder
fate: Add a target for creating a 16000 Hz mono synthetic audio file
macosx: use the default surface on newer sdl
Conflicts:
ffplay.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2e94751b32..23bb52c74e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2964,15 +2964,11 @@ typedef struct AVCodecContext { * - encoding: unused * - decoding: Set by user. */ -#if FF_API_ER - int error_recognition2; -#else - int error_recognition; -#endif /* FF_API_ER */ -#define AV_ER_CRCCHECK (1<<0) -#define AV_ER_BITSTREAM (1<<1) -#define AV_ER_AGGRESSIVE (1<<2) -#define AV_ER_EXPLODE (1<<3) + int err_recognition; +#define AV_EF_CRCCHECK (1<<0) +#define AV_EF_BITSTREAM (1<<1) +#define AV_EF_BUFFER (1<<2) +#define AV_EF_EXPLODE (1<<3) /** * Current statistics for PTS correction. @@ -2984,7 +2980,6 @@ typedef struct AVCodecContext { int64_t pts_correction_last_pts; /// PTS of the last frame int64_t pts_correction_last_dts; /// DTS of the last frame - } AVCodecContext; /** |