diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-03 20:11:45 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-04 11:26:57 -0500 |
| commit | a2704c9712ad35cc22e7e0d8a79b581c07fa383b (patch) | |
| tree | ebf5a27a98dbd52d983e38e901661f7525b38e9a /libavformat/utils.c | |
| parent | e16ead0716c2f988d1e26369a4c67b354ff86134 (diff) | |
| download | ffmpeg-a2704c9712ad35cc22e7e0d8a79b581c07fa383b.tar.gz | |
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f48ed2ab1c..91bc4a2025 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -330,7 +330,7 @@ int av_get_packet(AVIOContext *s, AVPacket *pkt, int size) if(ret<0) return ret; - pkt->pos= url_ftell(s); + pkt->pos= avio_tell(s); ret= avio_read(s, pkt->data, size); if(ret<=0) @@ -490,7 +490,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, } if (pb && !ic->data_offset) - ic->data_offset = url_ftell(ic->pb); + ic->data_offset = avio_tell(ic->pb); #if FF_API_OLD_METADATA ff_metadata_demux_compat(ic); @@ -2212,7 +2212,7 @@ int av_find_stream_info(AVFormatContext *ic) int i, count, ret, read_size, j; AVStream *st; AVPacket pkt1, *pkt; - int64_t old_offset = url_ftell(ic->pb); + int64_t old_offset = avio_tell(ic->pb); for(i=0;i<ic->nb_streams;i++) { AVCodec *codec; |