virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf: remove disabled FF_API_MUXRATE cruft

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-12 13:31:55 +01:00
parent 2f5e728b58
commit f0cb13958d
5 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -850,12 +850,6 @@ typedef struct AVFormatContext {
int64_t data_offset; /**< offset of the first packet */ int64_t data_offset; /**< offset of the first packet */
#endif #endif
#if FF_API_MUXRATE
/**
* use mpeg muxer private options instead
*/
attribute_deprecated int mux_rate;
#endif
unsigned int packet_size; unsigned int packet_size;
#if FF_API_PRELOAD #if FF_API_PRELOAD
attribute_deprecated int preload; attribute_deprecated int preload;

5
libavformat/mpegenc.c
View File

@ -421,11 +421,6 @@ static int mpeg_mux_init(AVFormatContext *ctx)
video_bitrate += codec_rate; 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) { if (!s->mux_rate) {
/* we increase slightly the bitrate to take into account the /* we increase slightly the bitrate to take into account the
headers. XXX: compute it exactly */ headers. XXX: compute it exactly */

5
libavformat/mpegtsenc.c
View File

@ -549,11 +549,6 @@ static int mpegts_write_header(AVFormatContext *s)
service->pcr_pid = ts_st->pid; 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) { if (ts->mux_rate > 1) {
service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) / service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) /
(TS_PACKET_SIZE * 8 * 1000); (TS_PACKET_SIZE * 8 * 1000);

3
libavformat/options.c
View File

@ -82,9 +82,6 @@ static const AVClass *format_child_class_next(const AVClass *prev)
static const AVOption options[]={ static const AVOption options[]={
{"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.dbl = 5000000 }, 32, INT_MAX, D}, {"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}, {"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"}, {"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"}, {"ignidx", "ignore index", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_IGNIDX }, INT_MIN, INT_MAX, D, "fflags"},

3
libavformat/version.h
View File

@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * 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 #ifndef FF_API_RTSP_URL_OPTIONS
#define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif