[FFmpeg-cvslog] lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name

[Dustin Brody]

ffmpeg | branch: master | Dustin Brody <libav at parsoma.net> | Sun Oct 16 21:22:02 2011 -0400| [204e6132d24012abb03ab00bbae4b5db6a3074d0] | committer: Anton Khirnov

lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-conflicting name

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=204e6132d24012abb03ab00bbae4b5db6a3074d0
---

 libavcodec/avcodec.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 593ee36..8298d5a 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)