Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'

* commit '1146bb3babca3973e88005d267cd06210d6ac075':
  lavc: Drop deprecated voxware codec entry

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

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/codec_desc.c
Simple merge

diff --cc libavcodec/version.h
index 9040dae8fb04fb2b234386aa8814dd66c7419b2f,1f064832114acb0e513c1bae90313ca0a2ad7149..95be1ed4cd64f9539d96ab591b8f5b54bd7afc43
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,18 -45,8 +45,15 @@@
   * 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_VOXWARE
- #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
 +#ifndef FF_API_LOWRES
 +#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
 +#endif
  #ifndef FF_API_SET_DIMENSIONS
  #define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif