summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/avio.h8
-rw-r--r--libavformat/aviobuf.c2
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)
{