From 204e6132d24012abb03ab00bbae4b5db6a3074d0 Mon Sep 17 00:00:00 2001
From: Dustin Brody <libav@parsoma.net>
Date: Sun, 16 Oct 2011 21:22:02 -0400
Subject: [PATCH] lavc: replace API-bump-triggered AVCodecContext field change
 with shorter, non-conflicting name

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavcodec/avcodec.h | 6 +-----
 1 file changed, 1 insertion(+), 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)