Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

* commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88':
  lavf: Drop deprecated hint to set muxer timebase

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

diff --cc libavformat/mux.c
Simple merge

diff --cc libavformat/version.h
index 64b6a3827be033151430ff6470469a5aabf0a76a,7060375c1aa6cef080e7b0217e36d5624befbff8..8e940597ee68ac211998fa6d6063eac7a789909f
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -49,20 -47,10 +49,17 @@@
   * 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_CODEC_TB
- #define FF_API_LAVF_CODEC_TB            (LIBAVFORMAT_VERSION_MAJOR < 58)
- #endif
 -
 +#ifndef FF_API_URL_FEOF
 +#define FF_API_URL_FEOF                 (LIBAVFORMAT_VERSION_MAJOR < 58)
 +#endif
  #ifndef FF_API_LAVF_FMT_RAWPICTURE
 -#define FF_API_LAVF_FMT_RAWPICTURE      (LIBAVFORMAT_VERSION_MAJOR < 59)
 +#define FF_API_LAVF_FMT_RAWPICTURE      (LIBAVFORMAT_VERSION_MAJOR < 58)
  #endif
  #ifndef FF_API_COMPUTE_PKT_FIELDS2
  #define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 59)