virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

Browse Source
This commit is contained in:
Anton Khirnov
2013-02-23 08:20:12 +01:00
parent d6ed604cf4
commit 0a7c4daf46
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avformat.h
View File

@@ -1386,17 +1386,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.

7
libavformat/utils.c
View File

@@ -2705,13 +2705,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 = *ps; AVFormatContext *s = *ps;

3
libavformat/version.h
View File

@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_APPLEHTTP_PROTO
#define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55) #define FF_API_APPLEHTTP_PROTO (LIBAVFORMAT_VERSION_MAJOR < 55)
#endif #endif