aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avio.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-21 22:45:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-23 18:22:03 +0100
commitebb92e076883f87cee2a3ddd4a7fe164f422f462 (patch)
tree884592f35c0a1e775c2393d1d535f26e648a8f8f /libavformat/avio.h
parentc24a40349693e50aa81ef68a4a522503ca504d50 (diff)
downloadffmpeg-ebb92e076883f87cee2a3ddd4a7fe164f422f462.tar.gz
avio: rename url_fopen/fclose -> avio_open/close.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
Diffstat (limited to 'libavformat/avio.h')
-rw-r--r--libavformat/avio.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 41fe6fbeca..5876228235 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -410,6 +410,18 @@ attribute_deprecated void put_be16(AVIOContext *s, unsigned int val);
/**
* @}
*/
+
+
+/**
+ * @defgroup old_url_f_funcs Old url_f* functions
+ * @deprecated use the avio_ -prefixed functions instead.
+ * @{
+ */
+attribute_deprecated int url_fopen( AVIOContext **s, const char *url, int flags);
+attribute_deprecated int url_fclose(AVIOContext *s);
+/**
+ * @}
+ */
#endif
AVIOContext *avio_alloc_context(
@@ -591,9 +603,9 @@ int ff_rewind_with_probe_data(AVIOContext *s, unsigned char *buf, int buf_size);
* @return 0 in case of success, a negative value corresponding to an
* AVERROR code in case of failure
*/
-int url_fopen(AVIOContext **s, const char *url, int flags);
+int avio_open(AVIOContext **s, const char *url, int flags);
-int url_fclose(AVIOContext *s);
+int avio_close(AVIOContext *s);
URLContext *url_fileno(AVIOContext *s);
/**