Browse Source

lavf: remove disabled FF_API_PRELOAD cruft

tags/n0.11
Anton Khirnov 13 years ago
parent
commit
2a0f868cfa
3 changed files with 0 additions and 10 deletions
  1. +0
    -3
      libavformat/avformat.h
  2. +0
    -4
      libavformat/mpegenc.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 3
libavformat/avformat.h View File

@@ -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;


+ 0
- 4
libavformat/mpegenc.c View File

@@ -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;


+ 0
- 3
libavformat/version.h View File

@@ -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


Loading…
Cancel
Save