From 2439f2ca82e28aa38b8aa2512bdb5a328e946cb9 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: lavf: remove disabled FF_API_OLD_AVIO cruft --- libavformat/options.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libavformat/options.c') diff --git a/libavformat/options.c b/libavformat/options.c index 7c75bf48fc..32cd43adb5 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -41,10 +41,8 @@ static void *format_child_next(void *obj, void *prev) ((s->iformat && s->iformat->priv_class) || s->oformat && s->oformat->priv_class)) return s->priv_data; -#if !FF_API_OLD_AVIO if (s->pb && s->pb->av_class && prev != s->pb) return s->pb; -#endif return NULL; } @@ -54,11 +52,7 @@ static const AVClass *format_child_class_next(const AVClass *prev) AVOutputFormat *ofmt = NULL; if (!prev) -#if !FF_API_OLD_AVIO return &ffio_url_class; -#else - prev = (void *)&ifmt; // Dummy pointer; -#endif while ((ifmt = av_iformat_next(ifmt))) if (ifmt->priv_class == prev) -- cgit v1.2.3 From 2d70912cc22239538593ff027dbb32d13409b888 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: lavf: remove disabled FF_API_FLAG_RTP_HINT cruft --- libavformat/avformat.h | 3 --- libavformat/movenc.c | 8 -------- libavformat/options.c | 3 --- libavformat/version.h | 3 --- 4 files changed, 17 deletions(-) (limited to 'libavformat/options.c') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a7d17126b2..f875c3df06 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -903,9 +903,6 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_IGNDTS 0x0008 ///< Ignore DTS on frames that contain both DTS & PTS #define AVFMT_FLAG_NOFILLIN 0x0010 ///< Do not infer any values from other values, just return what is stored in the container #define AVFMT_FLAG_NOPARSE 0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled -#if FF_API_FLAG_RTP_HINT -#define AVFMT_FLAG_RTP_HINT 0x0040 ///< Deprecated, use the -movflags rtphint muxer specific AVOption instead -#endif #define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it. #define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 48b474bfc6..f23a63b06e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2685,14 +2685,6 @@ static int mov_write_header(AVFormatContext *s) if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters) mov->chapter_track = mov->nb_streams++; -#if FF_API_FLAG_RTP_HINT - if (s->flags & AVFMT_FLAG_RTP_HINT) { - av_log(s, AV_LOG_WARNING, "The RTP_HINT flag is deprecated, enable it " - "via the -movflags rtphint muxer option " - "instead.\n"); - mov->flags |= FF_MOV_FLAG_RTP_HINT; - } -#endif if (mov->flags & FF_MOV_FLAG_RTP_HINT) { /* Add hint tracks for each audio and video stream */ hint_track = mov->nb_streams; diff --git a/libavformat/options.c b/libavformat/options.c index 32cd43adb5..7dbb8711a7 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -92,9 +92,6 @@ static const AVOption options[]={ {"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"}, {"noparse", "disable AVParsers, this needs nofillin too", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_NOPARSE }, INT_MIN, INT_MAX, D, "fflags"}, {"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, -#if FF_API_FLAG_RTP_HINT -{"rtphint", "add rtp hinting (deprecated, use the -movflags rtphint option instead)", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_RTP_HINT }, INT_MIN, INT_MAX, E, "fflags"}, -#endif {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.dbl = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"analyzeduration", "how many microseconds are analyzed to estimate duration", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT, {.dbl = 5*AV_TIME_BASE }, 0, INT_MAX, D}, {"cryptokey", "decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, {.dbl = 0}, 0, 0, D}, diff --git a/libavformat/version.h b/libavformat/version.h index c422b998c8..3246707309 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_FLAG_RTP_HINT -#define FF_API_FLAG_RTP_HINT (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_AVSTREAM_QUALITY #define FF_API_AVSTREAM_QUALITY (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -- cgit v1.2.3 From f0cb13958d8b45800f29b067ce2bc6e9f5f58740 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 12 Jan 2012 13:31:55 +0100 Subject: 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(-) (limited to 'libavformat/options.c') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4f95ecc1dc..970ca340d7 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 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 */ diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 90f223273e..c05f7f690e 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 7dbb8711a7..dcc3d60995 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 9b7ad49d23..e2e82fd0e8 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 -- cgit v1.2.3