Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

* commit '0c7986df444273b0e53d3992ba9cc1108bd6a386':
  lavc: Drop deprecated workaround bugs options

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

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/version.h
index b09beaa3b9c7cbeb6f061c7fdd04fe0de7919f19,225ee52a64a3fb0aaef940343b7147ceecd068f8..cf24b4133177d75b6e170067ce78f642112a4a29
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,24 -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_AC_VLC
- #define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
- #ifndef FF_API_OLD_MSMPEG4
- #define FF_API_OLD_MSMPEG4       (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_ASPECT_EXTENDED
  #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif