diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 09:37:10 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-12 19:17:05 +0200 |
commit | ff1ec0c3f8fce10e92010f82f7e859e08f9c742a (patch) | |
tree | 8eb19b5d1e5fd63807620ce4cdd7e166ad513b6b /libavformat/aviobuf.c | |
parent | c5e03cebd31e5bd2b6851d09a60280403a57faf0 (diff) | |
download | ffmpeg-ff1ec0c3f8fce10e92010f82f7e859e08f9c742a.tar.gz |
avio: undeprecate av_url_read_fseek/fpause under nicer names
It seems their replacements won't be ready anytime soon.
Diffstat (limited to 'libavformat/aviobuf.c')
-rw-r--r-- | libavformat/aviobuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 3814db6dfc..cde5f269b5 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -403,12 +403,12 @@ void put_flush_packet(AVIOContext *s) } int av_url_read_fpause(AVIOContext *s, int pause) { - return ffio_read_pause(s, pause); + return avio_pause(s, pause); } int64_t av_url_read_fseek(AVIOContext *s, int stream_index, int64_t timestamp, int flags) { - return ffio_read_seek(s, stream_index, timestamp, flags); + return avio_seek_time(s, stream_index, timestamp, flags); } void init_checksum(AVIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), @@ -1013,14 +1013,14 @@ int url_fget_max_packet_size(AVIOContext *s) } #endif -int ffio_read_pause(AVIOContext *s, int pause) +int avio_pause(AVIOContext *s, int pause) { if (!s->read_pause) return AVERROR(ENOSYS); return s->read_pause(s->opaque, pause); } -int64_t ffio_read_seek(AVIOContext *s, int stream_index, +int64_t avio_seek_time(AVIOContext *s, int stream_index, int64_t timestamp, int flags) { URLContext *h = s->opaque; |