From: Dustin Brody <libav@parsoma.net>
Date: Mon, 17 Oct 2011 01:22:02 +0000 (-0400)
Subject: lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-confli... 
X-Git-Tag: v0.8b1~1074
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=204e6132d24012abb03ab00bbae4b5db6a3074d0;p=platform%2Fupstream%2Flibav.git

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

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

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)