diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e3c22d44a2d8e83f5690570c49462d3bf60248ac..56c139905a97e21ed7fcbe5ce2eef19fcf2fd3b3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2155,17 +2155,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 888d58ed664611114c0ad39daa0f3cf5f5e0fc0f..0008073c5ba133879fb13c6ee015323bd03b9373 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3544,13 +3544,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; diff --git a/libavformat/version.h b/libavformat/version.h index 38433ee9d75e2bd14f08c4054c496f4bd953ed43..a9b6cb65627c85125bc7d28a186ee59126dfa8d9 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -61,9 +61,6 @@ #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) #endif -#ifndef FF_API_CLOSE_INPUT_FILE -#define FF_API_CLOSE_INPUT_FILE (LIBAVFORMAT_VERSION_MAJOR < 56) -#endif #ifndef FF_API_READ_PACKET #define FF_API_READ_PACKET (LIBAVFORMAT_VERSION_MAJOR < 56) #endif