[FFmpeg-cvslog] avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace
Michael Niedermayer
git at videolan.org
Mon Jun 29 16:32:48 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 23 18:24:57 2015 +0200| [da8b228977406b1be95d7881e38651f4e61d1fc6] | committer: Michael Niedermayer
avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace
This was suggested in the discussion about these functions
With this change the functions are available internally but are not
part of the public API
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da8b228977406b1be95d7881e38651f4e61d1fc6
---
doc/APIchanges | 4 ----
libavformat/avio.c | 4 ++--
libavformat/avio.h | 4 ++--
libavformat/version.h | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index cc2ebf3..6e64a05 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,10 +15,6 @@ libavutil: 2014-08-09
API changes, most recent first:
-2015-xx-xx - xxxxxxx - lavf 56.38.100 - avio.h url.h
- Add avio_move(), avio_delete().
- Extend URLProtocol with url_move(), url_delete().
-
-------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------
2015-06-04 - cc17b43 - lswr 1.2.100
diff --git a/libavformat/avio.c b/libavformat/avio.c
index aff8d10..c188adc 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -421,7 +421,7 @@ int avio_check(const char *url, int flags)
return ret;
}
-int avio_move(const char *url_src, const char *url_dst)
+int avpriv_io_move(const char *url_src, const char *url_dst)
{
URLContext *h_src, *h_dst;
int ret = ffurl_alloc(&h_src, url_src, AVIO_FLAG_READ_WRITE, NULL);
@@ -443,7 +443,7 @@ int avio_move(const char *url_src, const char *url_dst)
return ret;
}
-int avio_delete(const char *url)
+int avpriv_io_delete(const char *url)
{
URLContext *h;
int ret = ffurl_alloc(&h, url, AVIO_FLAG_WRITE, NULL);
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 5ac5d38..d3d9bbd 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -238,7 +238,7 @@ int avio_check(const char *url, int flags);
* @param url_dst new url to resource if the operation succeeded
* @return >=0 on success or negative on error.
*/
-int avio_move(const char *url_src, const char *url_dst);
+int avpriv_io_move(const char *url_src, const char *url_dst);
/**
* Delete a resource.
@@ -246,7 +246,7 @@ int avio_move(const char *url_src, const char *url_dst);
* @param url resource to be deleted.
* @return >=0 on success or negative on error.
*/
-int avio_delete(const char *url);
+int avpriv_io_delete(const char *url);
/**
* Open directory for reading.
diff --git a/libavformat/version.h b/libavformat/version.h
index a6d368e..5efc934 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 39
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list