From 5e71299758d3aa7c93c3cca618a8e048a9483794 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 5 Dec 2016 14:11:14 -0500 Subject: lavf: Drop deprecated bitexact functionality Deprecated in 05/2014. --- libavformat/mux.c | 7 ------- libavformat/version.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index a85c3c79db..dfda89d983 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -99,13 +99,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; -#if FF_API_LAVF_BITEXACT && FF_API_LAVF_AVCTX -FF_DISABLE_DEPRECATION_WARNINGS - if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) - s->flags |= AVFMT_FLAG_BITEXACT; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - // some sanity checks if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) { av_log(s, AV_LOG_ERROR, "no streams\n"); diff --git a/libavformat/version.h b/libavformat/version.h index 7103b5d969..26f5c75991 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -48,9 +48,6 @@ * 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. */ -#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 -- cgit v1.2.3