Merge commit '0337adfab5d14a17bf4d5060aa0425e4049a9862'

* commit '0337adfab5d14a17bf4d5060aa0425e4049a9862':
  lavc: Drop deprecated missing sample log function

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

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/utils.c
index 9551f312e7224fc5aff6182592b2fd400f04cb2a,8a481dd025c324d202e479a5018a7a68ffcc7254..95786e8b544755356669cc91e1f6634824c6f8ab
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -1911,37 -1359,7 +1911,8 @@@ int ff_match_2uint16(const uint16_t(*ta
      return i;
  }
  
- #if FF_API_MISSING_SAMPLE
- FF_DISABLE_DEPRECATION_WARNINGS
- void av_log_missing_feature(void *avc, const char *feature, int want_sample)
- {
-     av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your FFmpeg "
-             "version to the newest one from Git. If the problem still "
-             "occurs, it means that your file has a feature which has not "
-             "been implemented.\n", feature);
-     if(want_sample)
-         av_log_ask_for_sample(avc, NULL);
- }
- 
- void av_log_ask_for_sample(void *avc, const char *msg, ...)
- {
-     va_list argument_list;
- 
-     va_start(argument_list, msg);
- 
-     if (msg)
-         av_vlog(avc, AV_LOG_WARNING, msg, argument_list);
-     av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample "
-             "of this file to ftp://upload.ffmpeg.org/incoming/ "
-             "and contact the ffmpeg-devel mailing list. (ffmpeg-devel@ffmpeg.org)\n");
- 
-     va_end(argument_list);
- }
- FF_ENABLE_DEPRECATION_WARNINGS
- #endif /* FF_API_MISSING_SAMPLE */
- 
  static AVHWAccel *first_hwaccel = NULL;
 +static AVHWAccel **last_hwaccel = &first_hwaccel;
  
  void av_register_hwaccel(AVHWAccel *hwaccel)
  {

diff --cc libavcodec/version.h
index 9f1543a6aa4c68846667d71d6de85a2814940a66,95b8ed63913837c43bacf03049199955aec0b45c..cd2ca5f1a2d527e7ed7c652251e4a742300b096f
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -45,26 -45,10 +45,23 @@@
   * 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_MISSING_SAMPLE
- #define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 58)
- #endif
 +#ifndef FF_API_VIMA_DECODER
 +#define FF_API_VIMA_DECODER     (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
 +#ifndef FF_API_AUDIO_CONVERT
 +#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 58)
 +#endif
 +#ifndef FF_API_AVCODEC_RESAMPLE
 +#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
 +#endif
  #ifndef FF_API_LOWRES
 -#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 58)
 +#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
  #endif
  #ifndef FF_API_CAP_VDPAU
  #define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 58)