highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-21 15:54:22 -03:00
commit 1198e34e11
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mux.c
View File

@ -275,17 +275,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
st = s->streams[i]; st = s->streams[i];
par = st->codecpar; 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 #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN && if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN &&

3
libavformat/version.h
View File

@ -55,9 +55,6 @@
* at once through the bump. This improves the git bisect-ability of the change. * 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 #ifndef FF_API_URL_FEOF
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58) #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif #endif