aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-12-11 10:34:08 +0100
committerAnton Khirnov <anton@khirnov.net>2011-12-12 20:23:56 +0100
commit526604545fb1cc0c11af356fbffd5cddf8cdc95f (patch)
tree1c3b0c53decd94ddd1c735283129c09af73b5938 /libavformat/avformat.h
parent3a7f7678eb3be1f9a28414c9908ed8d34b1b9846 (diff)
downloadffmpeg-526604545fb1cc0c11af356fbffd5cddf8cdc95f.tar.gz
lavf: add avformat_close_input().
It sets the supplied AVFormatContext pointer to NULL after freeing it, which is safer and its name is consistent with other lavf functions. Also deprecate av_close_input_file().
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 548bc186fb..2eb75df43a 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1570,12 +1570,22 @@ attribute_deprecated
void av_close_input_stream(AVFormatContext *s);
#endif
+#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.
+ */
+void avformat_close_input(AVFormatContext **s);
/**
* @}
*/