virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Dustin Brody 2011-10-13 03:26:53 -04:00 committed by Anton Khirnov
parent ac90a71459
commit 582f231142
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/avcodec.h
View File

@ -1465,21 +1465,19 @@ typedef struct AVCodecContext {
*/
float b_quant_offset;
#if FF_API_ER
/**
* Error recognition; higher values will detect more errors but may
* misdetect some more or less valid parts as errors.
* - encoding: unused
* - decoding: Set by user.
*/
int error_recognition;
attribute_deprecated int error_recognition;
#define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2
#define FF_ER_AGGRESSIVE 3
#if FF_API_ER
#define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5
#else
#define FF_ER_EXPLODE 4
#endif /* FF_API_ER */
/**
@ -2905,6 +2903,21 @@ typedef struct AVCodecContext {
* - decoding: Set by user.
*/
enum AVSampleFormat request_sample_fmt;
/**
* Error recognition; may misdetect some more or less valid parts as errors.
* - 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)
} AVCodecContext;
/**