lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

pull/12/merge
Anton Khirnov 12 years ago
parent d6ed604cf4
commit 0a7c4daf46
  1. 11
      libavformat/avformat.h
  2. 7
      libavformat/utils.c
  3. 3
      libavformat/version.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.

@ -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;

@ -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

Loading…
Cancel
Save