diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-10-16 21:22:02 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-18 12:28:22 +0200 |
| commit | 204e6132d24012abb03ab00bbae4b5db6a3074d0 (patch) | |
| tree | ed6fde62e0df709b4fe00988d770ed2c95467e23 | |
| parent | 075d6439f17596a89dbf9fb6b3e1094ad0495f27 (diff) | |
| download | ffmpeg-204e6132d24012abb03ab00bbae4b5db6a3074d0.tar.gz | |
lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 593ee363dd..8298d5aeff 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2909,11 +2909,7 @@ typedef struct AVCodecContext { * - encoding: unused * - decoding: Set by user. */ -#if FF_API_ER - int error_recognition2; -#else - int error_recognition; -#endif /* FF_API_ER */ + int err_recognition; #define AV_ER_CRCCHECK (1<<0) #define AV_ER_BITSTREAM (1<<1) #define AV_ER_AGGRESSIVE (1<<2) |