diff options
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavformat/avio.c | 4 | ||||
| -rw-r--r-- | libavformat/avio.h | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index cc2ebf3de5..6e64a05f10 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 aff8d10d4a..c188adcce1 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 5ac5d38568..d3d9bbd15e 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 a6d368ec0f..5efc934107 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, \ |