Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'

* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
  lavc: Drop deprecated way of setting codec dimensions

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

diff --cc libavcodec/avcodec.h
index e02445e3833c887c4318ed93a9ee6dff2319b8c1,11a3280eb8da6de1b743252cffd7e31d8691f9d5..40c8fab3696dc59360ee5a2bb9698425c92df94f
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -5638,15 -4937,6 +5638,7 @@@ enum AVPixelFormat avcodec_default_get_
   * @}
   */
  
- #if FF_API_SET_DIMENSIONS
- /**
-  * @deprecated this function is not supposed to be used from outside of lavc
-  */
- attribute_deprecated
- void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
- #endif
- 
 +#if FF_API_TAG_STRING
  /**
   * Put a string representing the codec tag codec_tag in buf.
   *

diff --cc libavcodec/utils.c
index 95786e8b544755356669cc91e1f6634824c6f8ab,6cef65083d7ba35babaa082a847cbcae4ffd2384..05f4302ad11d6dfaddfd5a1d841a8fad4c81834b
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -198,19 -125,9 +198,9 @@@ unsigned avcodec_get_edge_width(void
  }
  #endif
  
- #if FF_API_SET_DIMENSIONS
- void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
- {
-     int ret = ff_set_dimensions(s, width, height);
-     if (ret < 0) {
-         av_log(s, AV_LOG_WARNING, "Failed to set dimensions %d %d\n", width, height);
-     }
- }
- #endif
- 
  int ff_set_dimensions(AVCodecContext *s, int width, int height)
  {
 -    int ret = av_image_check_size(width, height, 0, s);
 +    int ret = av_image_check_size2(width, height, s->max_pixels, AV_PIX_FMT_NONE, 0, s);
  
      if (ret < 0)
          width = height = 0;

diff --cc libavcodec/version.h
index 95be1ed4cd64f9539d96ab591b8f5b54bd7afc43,a12c322f49eb2e5e2354a4de97fd2161c650f7bd..fd334e83fd937e15f9b0113e57d1bb1526d844bc
--- 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_SET_DIMENSIONS
- #define FF_API_SET_DIMENSIONS    (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