apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 20:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

avio: deprecate url_fskip

Browse Source 
avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov
2011-02-28 14:57:56 +01:00
committed by Ronald S. Bultje
parent e356fc57a2
commit 0300db8ad7
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avio.h
View File

@@ -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_fopen( AVIOContext **s, const char *url, int flags);
attribute_deprecated int url_fclose(AVIOContext *s); attribute_deprecated int url_fclose(AVIOContext *s);
attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence); attribute_deprecated int64_t url_fseek(AVIOContext *s, int64_t offset, int whence);
attribute_deprecated int url_fskip(AVIOContext *s, int64_t offset);
/** /**
* @} * @}
*/ */
@@ -468,13 +469,6 @@ int avio_put_str16le(AVIOContext *s, const char *str);
*/ */
int64_t avio_seek(AVIOContext *s, int64_t offset, int whence); 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. * ftell() equivalent for AVIOContext.
* @return position or AVERROR. * @return position or AVERROR.

2
libavformat/aviobuf.c
View File

@@ -233,11 +233,13 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
return offset; return offset;
} }
#if FF_API_OLD_AVIO
int url_fskip(AVIOContext *s, int64_t offset) int url_fskip(AVIOContext *s, int64_t offset)
{ {
int64_t ret = avio_seek(s, offset, SEEK_CUR); int64_t ret = avio_seek(s, offset, SEEK_CUR);
return ret < 0 ? ret : 0; return ret < 0 ? ret : 0;
} }
#endif
int64_t url_ftell(AVIOContext *s) int64_t url_ftell(AVIOContext *s)
{ {