diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:42:38 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | 4df001d77f8f39d2914b21f14ca2236b0ffd6a48 (patch) | |
| tree | 88004750d09af4c3bca4b611b11fc1994e121cde | |
| parent | 5048e36c994663f7f4977efc48c3eec601654e5a (diff) | |
| download | ffmpeg-4df001d77f8f39d2914b21f14ca2236b0ffd6a48.tar.gz | |
lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/options.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index dae56c6037..3e47285267 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1043,13 +1043,6 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, int buf_size, AVFormatParameters *ap); -#if FF_API_ALLOC_FORMAT_CONTEXT -/** - * @deprecated Use avformat_alloc_context() instead. - */ -attribute_deprecated AVFormatContext *av_alloc_format_context(void); -#endif - /** * Allocate an AVFormatContext. * avformat_free_context() can be used to free the context and everything diff --git a/libavformat/options.c b/libavformat/options.c index 40edcec762..2192ff6575 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -84,10 +84,3 @@ AVFormatContext *avformat_alloc_context(void) ic->av_class = &av_format_context_class; return ic; } - -#if FF_API_ALLOC_FORMAT_CONTEXT -AVFormatContext *av_alloc_format_context(void) -{ - return avformat_alloc_context(); -} -#endif diff --git a/libavformat/version.h b/libavformat/version.h index 9b8192d96d..f87665c205 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_URL_CLASS #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #endif -#ifndef FF_API_ALLOC_FORMAT_CONTEXT -#define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53) -#endif #ifndef FF_API_PARSE_FRAME_PARAM #define FF_API_PARSE_FRAME_PARAM (LIBAVFORMAT_VERSION_MAJOR < 53) #endif |