[FFmpeg-cvslog] Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 15:54:22 2017 -0300| [1198e34e118966d6e64be5801efafad2f629f4ce] | committer: James Almer

Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1198e34e118966d6e64be5801efafad2f629f4ce
---

 libavformat/mux.c     | 11 -----------
 libavformat/version.h |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index c7711e8ae0..498eb2e61f 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -275,17 +275,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
         st  = s->streams[i];
         par = st->codecpar;
 
-#if FF_API_LAVF_CODEC_TB && FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
-        if (!st->time_base.num && st->codec->time_base.num) {
-            av_log(s, AV_LOG_WARNING, "Using AVStream.codec.time_base as a "
-                   "timebase hint to the muxer is deprecated. Set "
-                   "AVStream.time_base instead.\n");
-            avpriv_set_pts_info(st, 64, st->codec->time_base.num, st->codec->time_base.den);
-        }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
 #if FF_API_LAVF_AVCTX
 FF_DISABLE_DEPRECATION_WARNINGS
         if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN &&
diff --git a/libavformat/version.h b/libavformat/version.h
index 64b6a3827b..8e940597ee 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -55,9 +55,6 @@
  * 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


======================================================================

diff --cc libavformat/version.h
index 64b6a3827b,7060375c1a..8e940597ee
--- a/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)