summaryrefslogtreecommitdiff
path: root/libavformat/nuv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-03 20:11:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-05 02:29:31 +0100
commit384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 (patch)
treea3ec8979530bffeb61b84161d1681120bf1234af /libavformat/nuv.c
parent773947ba76c575abc01ba128206c87440dad40ec (diff)
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
Diffstat (limited to 'libavformat/nuv.c')
-rw-r--r--libavformat/nuv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 6c7c563b85..6f4a03192d 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -197,7 +197,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
int ret, size;
while (!url_feof(pb)) {
int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0;
- uint64_t pos = url_ftell(pb);
+ uint64_t pos = avio_tell(pb);
ret = avio_read(pb, hdr, HDRSIZE);
if (ret < HDRSIZE)
return ret < 0 ? ret : AVERROR(EIO);