diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-11 18:22:45 +0100 |
| commit | 0a7c4daf469d4ac447fb822fe78337f62f4c04e6 (patch) | |
| tree | 853fcc3bf22fc07cb4f3342f8adecdfc8fb50218 /libavformat | |
| parent | d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68 (diff) | |
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 11 | ||||
| -rw-r--r-- | libavformat/utils.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 21 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 097d506a82..32d9c0c195 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1386,17 +1386,6 @@ int av_read_play(AVFormatContext *s); */ int av_read_pause(AVFormatContext *s); -#if FF_API_CLOSE_INPUT_FILE -/** - * @deprecated use avformat_close_input() - * Close a media file (but not its codecs). - * - * @param s media file handle - */ -attribute_deprecated -void av_close_input_file(AVFormatContext *s); -#endif - /** * Close an opened input AVFormatContext. Free it and all its contents * and set *s to NULL. diff --git a/libavformat/utils.c b/libavformat/utils.c index 61802a82e6..e74fa9e218 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2705,13 +2705,6 @@ void avformat_free_context(AVFormatContext *s) av_free(s); } -#if FF_API_CLOSE_INPUT_FILE -void av_close_input_file(AVFormatContext *s) -{ - avformat_close_input(&s); -} -#endif - void avformat_close_input(AVFormatContext **ps) { AVFormatContext *s = *ps; diff --git a/libavformat/version.h b/libavformat/version.h index 52e4782008..c781740ca6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -49,9 +49,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_CLOSE_INPUT_FILE -#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 55) -#endif #ifndef FF_API_APPLEHTTP_PROTO #define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55) #endif |