diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 15:54:22 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:54:22 -0300 |
| commit | 1198e34e118966d6e64be5801efafad2f629f4ce (patch) | |
| tree | c62994658ef1d8c54e8f941a1410bd2bd49b589a | |
| parent | a295fee28496296a711715e4f5c93e4ad3168a71 (diff) | |
| parent | 63fe79a3368cc53e6faf7fa265a9a1a8bec46a88 (diff) | |
| download | ffmpeg-1198e34e118966d6e64be5801efafad2f629f4ce.tar.gz | |
Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'
* commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88':
lavf: Drop deprecated hint to set muxer timebase
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/mux.c | 11 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 0 insertions, 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 |