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: [PATCH] lavf: remove disabled FF_API_MUXRATE cruft
---
libavformat/avformat.h | 6 ------
libavformat/mpegenc.c | 5 -----
libavformat/mpegtsenc.c | 5 -----
libavformat/options.c | 3 ---
libavformat/version.h | 3 ---
5 files changed, 22 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4f95ecc1dc5..970ca340d73 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -850,12 +850,6 @@ typedef struct AVFormatContext {
int64_t data_offset; /**< offset of the first packet */
#endif
-#if FF_API_MUXRATE
- /**
- * use mpeg muxer private options instead
- */
- attribute_deprecated int mux_rate;
-#endif
unsigned int packet_size;
#if FF_API_PRELOAD
attribute_deprecated int preload;
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index b2ca35a3df1..9416f031296 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 */
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 90f223273ef..c05f7f690e7 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -549,11 +549,6 @@ static int mpegts_write_header(AVFormatContext *s)
service->pcr_pid = ts_st->pid;
}
-#if FF_API_MUXRATE
- if (s->mux_rate)
- ts->mux_rate = s->mux_rate;
-#endif
-
if (ts->mux_rate > 1) {
service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) /
(TS_PACKET_SIZE * 8 * 1000);
diff --git a/libavformat/options.c b/libavformat/options.c
index 7dbb8711a7c..dcc3d609950 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -82,9 +82,6 @@ static const AVClass *format_child_class_next(const AVClass *prev)
static const AVOption options[]={
{"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.dbl = 5000000 }, 32, INT_MAX, D},
-#if FF_API_MUXRATE
-{"muxrate", "set mux rate", OFFSET(mux_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E},
-#endif
{"packetsize", "set packet size", OFFSET(packet_size), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, E},
{"fflags", NULL, OFFSET(flags), AV_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, INT_MIN, INT_MAX, D|E, "fflags"},
{"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"},
diff --git a/libavformat/version.h b/libavformat/version.h
index 9b7ad49d234..e2e82fd0e88 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_MUXRATE
-#define FF_API_MUXRATE (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
#ifndef FF_API_RTSP_URL_OPTIONS
#define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
--
GitLab