diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-12 13:31:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:52:42 +0100 |
| commit | 997420abf2e5856f5b9e9267ca5cce6fe5c8a406 (patch) | |
| tree | 458462f4a49f16c8e0cce49d1c9912fc31d7ea3a | |
| parent | 2fb7501938b7103624c9bef740ca498258cacdab (diff) | |
| download | ffmpeg-997420abf2e5856f5b9e9267ca5cce6fe5c8a406.tar.gz | |
lavf: remove disabled FF_API_DUMP_FORMAT cruft
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 10 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 629f738ac1..9156be03d4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1731,12 +1731,6 @@ void av_url_split(char *proto, int proto_size, char *path, int path_size, const char *url); -#if FF_API_DUMP_FORMAT -attribute_deprecated void dump_format(AVFormatContext *ic, - int index, - const char *url, - int is_output); -#endif void av_dump_format(AVFormatContext *ic, int index, diff --git a/libavformat/utils.c b/libavformat/utils.c index 8860d47690..2f4a6d127d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3282,16 +3282,6 @@ static void dump_stream_format(AVFormatContext *ic, int i, int index, int is_out dump_metadata(NULL, st->metadata, " "); } -#if FF_API_DUMP_FORMAT -void dump_format(AVFormatContext *ic, - int index, - const char *url, - int is_output) -{ - av_dump_format(ic, index, url, is_output); -} -#endif - void av_dump_format(AVFormatContext *ic, int index, const char *url, diff --git a/libavformat/version.h b/libavformat/version.h index f55fc019c1..e1daff2771 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_DUMP_FORMAT -#define FF_API_DUMP_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 54) -#endif #ifndef FF_API_PARSE_DATE #define FF_API_PARSE_DATE (LIBAVFORMAT_VERSION_MAJOR < 54) #endif |