diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 15:48:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:48:25 -0300 |
| commit | f02bda3a03c1103a1c293ad030e6bcf089b21902 (patch) | |
| tree | ddea22aa1a1a60944f3c28855a333213da66e622 /libavformat | |
| parent | d1b1a65662e3657ba05aa76023dde19712470f58 (diff) | |
| parent | 5e71299758d3aa7c93c3cca618a8e048a9483794 (diff) | |
| download | ffmpeg-f02bda3a03c1103a1c293ad030e6bcf089b21902.tar.gz | |
Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'
* commit '5e71299758d3aa7c93c3cca618a8e048a9483794':
lavf: Drop deprecated bitexact functionality
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mux.c | 9 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 53ad46df42..c7711e8ae0 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -255,19 +255,10 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) FF_DISABLE_DEPRECATION_WARNINGS if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) { if (!(s->flags & AVFMT_FLAG_BITEXACT)) { -#if FF_API_LAVF_BITEXACT - av_log(s, AV_LOG_WARNING, - "Setting the AVFormatContext to bitexact mode, because " - "the AVCodecContext is in that mode. This behavior will " - "change in the future. To keep the current behavior, set " - "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n"); - s->flags |= AVFMT_FLAG_BITEXACT; -#else av_log(s, AV_LOG_WARNING, "The AVFormatContext is not in set to bitexact mode, only " "the AVCodecContext. If this is not intended, set " "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n"); -#endif } } FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavformat/version.h b/libavformat/version.h index ed0439a26a..262cd35fe0 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_BITEXACT -#define FF_API_LAVF_BITEXACT (LIBAVFORMAT_VERSION_MAJOR < 58) -#endif #ifndef FF_API_LAVF_FRAC #define FF_API_LAVF_FRAC (LIBAVFORMAT_VERSION_MAJOR < 58) #endif |