diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-28 14:57:56 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-01 12:27:08 -0500 |
| commit | 0300db8ad778a194b4a8ec98f6da3de5b41c46ee (patch) | |
| tree | 65163265c70e15ae8f5d146569d8699397ba57d0 | |
| parent | e356fc57a2e9887370caec58d8aafeafd1f336dc (diff) | |
| download | ffmpeg-0300db8ad778a194b4a8ec98f6da3de5b41c46ee.tar.gz | |
avio: deprecate url_fskip
avio_seek should be used instead
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavformat/avio.h | 8 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 568bdd346a..cc46ad79e5 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -421,6 +421,7 @@ attribute_deprecated void put_tag(AVIOContext *s, const char *tag); attribute_deprecated int url_fopen( AVIOContext **s, const char *url, int flags); attribute_deprecated int url_fclose(AVIOContext *s); attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence); +attribute_deprecated int url_fskip(AVIOContext *s, int64_t offset); /** * @} */ @@ -469,13 +470,6 @@ int avio_put_str16le(AVIOContext *s, const char *str); int64_t avio_seek(AVIOContext *s, int64_t offset, int whence); /** - * Skip given number of bytes forward. - * @param offset number of bytes - * @return 0 on success, <0 on error - */ -int url_fskip(AVIOContext *s, int64_t offset); - -/** * ftell() equivalent for AVIOContext. * @return position or AVERROR. */ diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index a74ad21604..0c733a704b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -233,11 +233,13 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) return offset; } +#if FF_API_OLD_AVIO int url_fskip(AVIOContext *s, int64_t offset) { int64_t ret = avio_seek(s, offset, SEEK_CUR); return ret < 0 ? ret : 0; } +#endif int64_t url_ftell(AVIOContext *s) { |