Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a'

* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
  Postpone API-incompatible changes until the next bump

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/version.h
index 0ef31653caae1240c471493031d52f696ef8bd11,517f0ea61ab2e13a7758f2ba4e94ea0d047706dd..7c8a1691dad2fd2ebf7d081eb3a2b92b0fde926b
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -46,124 -46,95 +46,124 @@@
   * 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_VIMA_DECODER
 +#define FF_API_VIMA_DECODER     (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_OLD_DECODE_AUDIO
 +#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_OLD_ENCODE_AUDIO
 +#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_OLD_ENCODE_VIDEO
 +#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_CODEC_ID
 +#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_AUDIO_CONVERT
 +#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_AVCODEC_RESAMPLE
 +#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
 +#endif
  #ifndef FF_API_MISSING_SAMPLE
- #define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_LOWRES
- #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_CAP_VDPAU
- #define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_BUFS_VDPAU
- #define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_VOXWARE
- #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_SET_DIMENSIONS
- #define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_DEBUG_MV
- #define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_AC_VLC
- #define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_OLD_MSMPEG4
- #define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_ASPECT_EXTENDED
- #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_ARCH_ALPHA
- #define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_XVMC
- #define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_ERROR_RATE
- #define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_QSCALE_TYPE
- #define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_MB_TYPE
- #define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_MAX_BFRAMES
- #define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
 -#ifndef FF_API_FAST_MALLOC
 -#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 58)
 -#endif
  #ifndef FF_API_NEG_LINESIZES
- #define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_EMU_EDGE
- #define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_EMU_EDGE          (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_ARCH_SH4
- #define FF_API_ARCH_SH4          (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_ARCH_SH4          (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_ARCH_SPARC
- #define FF_API_ARCH_SPARC        (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_ARCH_SPARC        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_UNUSED_MEMBERS
- #define FF_API_UNUSED_MEMBERS    (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_UNUSED_MEMBERS    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_IDCT_XVIDMMX
- #define FF_API_IDCT_XVIDMMX      (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_IDCT_XVIDMMX      (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_INPUT_PRESERVED
- #define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_INPUT_PRESERVED   (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_NORMALIZE_AQP
- #define FF_API_NORMALIZE_AQP     (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_NORMALIZE_AQP     (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_GMC
- #define FF_API_GMC               (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_GMC               (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_MV0
- #define FF_API_MV0               (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_MV0               (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_CODEC_NAME
- #define FF_API_CODEC_NAME        (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_CODEC_NAME        (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_AFD
- #define FF_API_AFD               (LIBAVCODEC_VERSION_MAJOR < 57)
+ #define FF_API_AFD               (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 < 57)
 +#endif
 +#ifndef FF_API_DV_FRAME_PROFILE
 +#define FF_API_DV_FRAME_PROFILE  (LIBAVCODEC_VERSION_MAJOR < 57)
 +#endif
  #ifndef FF_API_AUDIOENC_DELAY
  #define FF_API_AUDIOENC_DELAY    (LIBAVCODEC_VERSION_MAJOR < 58)
  #endif

diff --cc libavfilter/version.h
index ae2659be2734b874a34ef466421e727699d1834d,ca99002b6128b590b1093897eb0b22ec016c16c2..323d0fde3681ecfbb808bc2aee2dcc7e03ac8436
--- 1/libavfilter/version.h
--- 2/libavfilter/version.h
+++ b/libavfilter/version.h
@@@ -50,25 -50,19 +50,25 @@@
   */
  
  #ifndef FF_API_OLD_FILTER_OPTS
- #define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 6)
+ #define FF_API_OLD_FILTER_OPTS              (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif
 +#ifndef FF_API_OLD_FILTER_OPTS_ERROR
 +#define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 7)
 +#endif
  #ifndef FF_API_AVFILTER_OPEN
- #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 6)
+ #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif
  #ifndef FF_API_AVFILTER_INIT_FILTER
- #define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 6)
+ #define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif
  #ifndef FF_API_OLD_FILTER_REGISTER
- #define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 6)
+ #define FF_API_OLD_FILTER_REGISTER          (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif
 +#ifndef FF_API_OLD_GRAPH_PARSE
 +#define FF_API_OLD_GRAPH_PARSE              (LIBAVFILTER_VERSION_MAJOR < 5)
 +#endif
  #ifndef FF_API_NOCONST_GET_NAME
- #define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 6)
+ #define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif
  
  #endif /* AVFILTER_VERSION_H */

diff --cc libavformat/version.h
index f231474801961b4a59d6100c4dcf24062506975d,5e3b62505aa64a86e687f1b8a7baa51ca68de0d9..c6f1d6bc657b31804ebfaaab2fe2a693d664bdd1
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -47,29 -47,15 +47,29 @@@
   * 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_LAVF_BITEXACT
- #define FF_API_LAVF_BITEXACT            (LIBAVFORMAT_VERSION_MAJOR < 57)
+ #define FF_API_LAVF_BITEXACT            (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_LAVF_FRAC
- #define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 57)
+ #define FF_API_LAVF_FRAC                (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_LAVF_CODEC_TB
- #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 57)
+ #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif
 +#ifndef FF_API_URL_FEOF
 +#define FF_API_URL_FEOF                 (LIBAVFORMAT_VERSION_MAJOR < 57)
 +#endif
 +#ifndef FF_API_PROBESIZE_32
 +#define FF_API_PROBESIZE_32             (LIBAVFORMAT_VERSION_MAJOR < 57)
 +#endif
  
 +#ifndef FF_API_R_FRAME_RATE
 +#define FF_API_R_FRAME_RATE            1
 +#endif
  #endif /* AVFORMAT_VERSION_H */

diff --cc libavutil/version.h
index e2e4ca841bc6cad3abb4876859fe696f46c53b93,5a8853e7a8426d8ba88ca341c01c49b0555c4240..0fd0d6f25ae53bd9259e58a33b1dc0c7744f7254
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -84,27 -78,18 +84,27 @@@
   * @{
   */
  
 +#ifndef FF_API_OLD_AVOPTIONS
 +#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 55)
 +#endif
  #ifndef FF_API_VDPAU
- #define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 55)
+ #define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 56)
  #endif
 +#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
 +#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55)
 +#endif
  #ifndef FF_API_XVMC
- #define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 55)
+ #define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 56)
  #endif
  #ifndef FF_API_OPT_TYPE_METADATA
- #define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 55)
+ #define FF_API_OPT_TYPE_METADATA        (LIBAVUTIL_VERSION_MAJOR < 56)
  #endif
  #ifndef FF_API_DLOG
- #define FF_API_DLOG                     (LIBAVUTIL_VERSION_MAJOR < 55)
+ #define FF_API_DLOG                     (LIBAVUTIL_VERSION_MAJOR < 56)
  #endif
 +#ifndef FF_API_HMAC
 +#define FF_API_HMAC                     (LIBAVUTIL_VERSION_MAJOR < 55)
 +#endif
  #ifndef FF_API_CRYPTO_CONTEXT
  #define FF_API_CRYPTO_CONTEXT           (LIBAVUTIL_VERSION_MAJOR < 56)
  #endif