From f0cb13958d8b45800f29b067ce2bc6e9f5f58740 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:31:55 +0100
Subject: lavf: remove disabled FF_API_MUXRATE cruft

---
 libavformat/mpegenc.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'libavformat/mpegenc.c')

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index b2ca35a3df..9416f03129 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -421,11 +421,6 @@ static int mpeg_mux_init(AVFormatContext *ctx)
             video_bitrate += codec_rate;
     }
 
-#if FF_API_MUXRATE
-    if(ctx->mux_rate){
-        s->mux_rate= (ctx->mux_rate + (8 * 50) - 1) / (8 * 50);
-    } else
-#endif
     if (!s->mux_rate) {
         /* we increase slightly the bitrate to take into account the
            headers. XXX: compute it exactly */
-- 
cgit v1.2.3


From 2a0f868cfacd548d39665392cf4791c67bc2ea06 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 12 Jan 2012 13:31:55 +0100
Subject: lavf: remove disabled FF_API_PRELOAD cruft

---
 libavformat/avformat.h | 3 ---
 libavformat/mpegenc.c  | 4 ----
 libavformat/version.h  | 3 ---
 3 files changed, 10 deletions(-)

(limited to 'libavformat/mpegenc.c')

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
-- 
cgit v1.2.3