Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'

* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
  lavc: Drop deprecated global afd field

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

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/h264dec.c
index b11a5ea6362100de1caa881989aa187262c59fe1,2a532a7ef7404dd727cc5a0f8b7d924ea5c8be57..5abaaabf9deb0d71b2dac53d276e67ea1e39fa80
--- 1/libavcodec/h264dec.c
--- 2/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@@ -704,14 -601,8 +704,9 @@@ static int decode_nal_units(H264Contex
              break;
          case H264_NAL_SEI:
              ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx);
- #if FF_API_AFD
- FF_DISABLE_DEPRECATION_WARNINGS
-             h->avctx->dtg_active_format = h->sei.afd.active_format_description;
- FF_ENABLE_DEPRECATION_WARNINGS
- #endif /* FF_API_AFD */
 +            h->has_recovery_point = h->has_recovery_point || h->sei.recovery_point.recovery_frame_cnt != -1;
 +            if (avctx->debug & FF_DEBUG_GREEN_MD)
 +                debug_green_metadata(&h->sei.green_metadata, h->avctx);
              if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
                  goto end;
              break;

diff --cc libavcodec/mpeg12dec.c
Simple merge

diff --cc libavcodec/options_table.h
index c020d41930c07202a3eb6a927ebfd95752adecc0,7a8ef3d4a92c85f127dd29ef83b2a5d0c6207eb6..51932f857d22da331c229e49a69fcdedc8b529ca
--- 1/libavcodec/options_table.h
--- 2/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@@ -276,18 -243,10 +276,15 @@@ static const AVOption avcodec_options[
  {"vsad", "sum of absolute vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
  {"vsse", "sum of squared vertical differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_VSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
  {"nsse", "noise preserving sum of squared differences", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_NSSE }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 +#if CONFIG_SNOW_ENCODER
 +{"w53", "5/3 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W53 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 +{"w97", "9/7 wavelet, only used in snow", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_W97 }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 +#endif
  {"dctmax", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_DCTMAX }, INT_MIN, INT_MAX, V|E, "cmp_func"},
  {"chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_CHROMA }, INT_MIN, INT_MAX, V|E, "cmp_func"},
 +{"msad", "sum of absolute differences, median predicted", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_MEDIAN_SAD }, INT_MIN, INT_MAX, V|E, "cmp_func"},
  {"pre_dia_size", "diamond type & size for motion estimation pre-pass", OFFSET(pre_dia_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
  {"subq", "sub-pel motion estimation quality", OFFSET(me_subpel_quality), AV_OPT_TYPE_INT, {.i64 = 8 }, INT_MIN, INT_MAX, V|E},
- #if FF_API_AFD
- {"dtg_active_format", NULL, OFFSET(dtg_active_format), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
- #endif
  {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
  #if FF_API_QUANT_BIAS
  {"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E},

diff --cc libavcodec/pthread_frame.c
Simple merge

diff --cc libavcodec/version.h
index 3ad0db30ca31dea5dfb4648fe85ce7b090c56f3e,45c2dbd56092a4cb2bf0fc234ed2d4e7ae8d8f51..aa2e6a173fdf2111580a6653bcdb693a9b17ce10
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,25 -45,8 +45,22 @@@
   * 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_AFD
- #define FF_API_AFD               (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_VISMV
 +/* XXX: don't forget to drop the -vismv documentation */
 +#define FF_API_VISMV             (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
  #ifndef FF_API_AUDIOENC_DELAY
  #define FF_API_AUDIOENC_DELAY    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif