lavc: replace API-bump-triggered AVCodecContext field change with shorter, non-confli...

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

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