From 2a0f868cfacd548d39665392cf4791c67bc2ea06 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: [PATCH] lavf: remove disabled FF_API_PRELOAD cruft --- libavformat/avformat.h | 3 --- libavformat/mpegenc.c | 4 ---- libavformat/version.h | 3 --- 3 files changed, 10 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1bd2c49..7420dab 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 9416f03..852b3f1 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 a54a075..36f4366 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 -- 2.7.4