diff options
| author | James Almer <jamrial@gmail.com> | 2014-08-07 17:12:40 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 00:48:22 +0200 |
| commit | 5c3c67126feb046e25359096225507bf6dfe7b27 (patch) | |
| tree | 369a7f063a7812bc17d3d0e5a01e8434ac39893b | |
| parent | f1e626a3570c8367e096e655660a2f7be5673a86 (diff) | |
| download | ffmpeg-5c3c67126feb046e25359096225507bf6dfe7b27.tar.gz | |
lavf/avio: rename url_feof() to avio_feof()
It's a public function and should use the avio_ namespace
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavformat/avio.h | 7 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 9 | ||||
| -rw-r--r-- | libavformat/libavformat.v | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 5 |
5 files changed, 23 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4774f965c5..9bcd91614c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-08-xx - xxxxxxx - lavf 55.53.100 - avio.h + Add avio_feof() and deprecate url_feof(). + 2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h sws_getContext is not going to be removed in the future. diff --git a/libavformat/avio.h b/libavformat/avio.h index e607df5fb4..1aa3602402 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -276,7 +276,14 @@ int64_t avio_size(AVIOContext *s); * feof() equivalent for AVIOContext. * @return non zero if and only if end of file */ +int avio_feof(AVIOContext *s); +#if FF_API_URL_FEOF +/** + * @deprecated use avio_feof() + */ +attribute_deprecated int url_feof(AVIOContext *s); +#endif /** @warning currently size is limited */ int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3); diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index c7e92032d2..946f249cf1 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -292,7 +292,7 @@ int64_t avio_size(AVIOContext *s) return size; } -int url_feof(AVIOContext *s) +int avio_feof(AVIOContext *s) { if(!s) return 0; @@ -303,6 +303,13 @@ int url_feof(AVIOContext *s) return s->eof_reached; } +#if FF_API_URL_FEOF +int url_feof(AVIOContext *s) +{ + return avio_feof(s); +} +#endif + void avio_wl32(AVIOContext *s, unsigned int val) { avio_w8(s, (uint8_t) val ); diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v index 6ae64458c0..824399446d 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -19,7 +19,7 @@ LIBAVFORMAT_$MAJOR { ffurl_write; ffurl_protocol_next; #those are deprecated, remove on next bump - url_*; + url_feof; get_*; ff_codec_get_id; local: *; diff --git a/libavformat/version.h b/libavformat/version.h index ffa9f8721d..a10e14e455 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 52 +#define LIBAVFORMAT_VERSION_MINOR 53 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -61,6 +61,9 @@ #ifndef FF_API_LAVF_CODEC_TB #define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 57) #endif +#ifndef FF_API_URL_FEOF +#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) +#endif #ifndef FF_API_ALLOC_OUTPUT_CONTEXT #define FF_API_ALLOC_OUTPUT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 56) |