ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Sep 14 21:26:51 2014 -0300| [ecf457f3ac49e93f06edfe301db4bc2fdedca1ae] | committer: James Almer
avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruft Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecf457f3ac49e93f06edfe301db4bc2fdedca1ae --- libavformat/avformat.h | 11 ----------- libavformat/utils.c | 7 ------- libavformat/version.h | 3 --- 3 files changed, 21 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e3c22d4..56c1399 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 888d58e..0008073 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 38433ee..a9b6cb6 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
