Signed-off-by: James Almer <jamrial@gmail.com>tags/n2.5
@@ -2155,17 +2155,6 @@ int av_read_play(AVFormatContext *s); | |||||
*/ | */ | ||||
int av_read_pause(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 | * Close an opened input AVFormatContext. Free it and all its contents | ||||
* and set *s to NULL. | * and set *s to NULL. | ||||
@@ -3544,13 +3544,6 @@ void avformat_free_context(AVFormatContext *s) | |||||
av_free(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) | void avformat_close_input(AVFormatContext **ps) | ||||
{ | { | ||||
AVFormatContext *s; | AVFormatContext *s; | ||||
@@ -61,9 +61,6 @@ | |||||
#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) | #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) | ||||
#endif | #endif | ||||
#ifndef FF_API_CLOSE_INPUT_FILE | |||||
#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56) | |||||
#endif | |||||
#ifndef FF_API_READ_PACKET | #ifndef FF_API_READ_PACKET | ||||
#define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) | #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) | ||||
#endif | #endif | ||||