Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'

* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
  lavc: Drop deprecated avctx codec name

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/version.h
index e0be3d5021f43611b8c0e41217340a08528a5a1e,99aa9bf8ccf63b6f7ae43dc057deb2f07b5b02b4..3ad0db30ca31dea5dfb4648fe85ce7b090c56f3e
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,21 -45,8 +45,18 @@@
   * FF_API_* defines may be placed below to indicate public API that will be
   * dropped at a future version bump. The defines themselves are not part of
   * the public API and may change, break or disappear at any time.
 + *
 + * @note, when bumping the major version it is recommended to manually
 + * disable each FF_API_* in its own commit instead of disabling them all
 + * at once through the bump. This improves the git bisect-ability of the change.
   */
  
- #ifndef FF_API_CODEC_NAME
- #define FF_API_CODEC_NAME        (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
 +#ifndef FF_API_DEBUG_MV
 +#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
  #ifndef FF_API_AFD
  #define FF_API_AFD               (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif