From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 28 Feb 2011 13:57:56 +0000 (+0100)
Subject: avio: deprecate url_fskip
X-Git-Tag: android-x86-4.4-r1~18268
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=813cc7abafad646522fbcf24c5ecd00412236381;p=android-x86%2Fexternal-ffmpeg.git

avio: deprecate url_fskip

avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee)
---

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)
 {