diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:43 +0100 |
| commit | 2a0f868cfacd548d39665392cf4791c67bc2ea06 (patch) | |
| tree | 15dfb5d6275faa638201065c950050b9063ba3fe /libavformat | |
| parent | 1329827e79766e21277a575d7abfdd0f07eb854c (diff) | |
| download | ffmpeg-2a0f868cfacd548d39665392cf4791c67bc2ea06.tar.gz | |
lavf: remove disabled FF_API_PRELOAD cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/mpegenc.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1bd2c49c10..7420dabc37 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -851,9 +851,6 @@ typedef struct AVFormatContext { #endif unsigned int packet_size; -#if FF_API_PRELOAD - attribute_deprecated int preload; -#endif int max_delay; int flags; diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 9416f03129..852b3f13c9 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1158,10 +1158,6 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) int preload; const int is_iframe = st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (pkt->flags & AV_PKT_FLAG_KEY); -#if FF_API_PRELOAD - if (ctx->preload) - s->preload = ctx->preload; -#endif preload = av_rescale(s->preload, 90000, AV_TIME_BASE); pts= pkt->pts; diff --git a/libavformat/version.h b/libavformat/version.h index a54a075624..36f4366531 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. */ -#ifndef FF_API_PRELOAD -#define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_STREAM_COPY #define FF_API_STREAM_COPY (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |