summaryrefslogtreecommitdiff
path: root/libavformat/dv.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/dv.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/dv.c')
-rw-r--r--libavformat/dv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dv.c b/libavformat/dv.c
index cdc5f76923..4e256d7d39 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -417,8 +417,8 @@ static int dv_read_header(AVFormatContext *s,
return -1;
}
if (state == 0x003f0700 || state == 0xff3f0700)
- marker_pos = url_ftell(s->pb);
- if (state == 0xff3f0701 && url_ftell(s->pb) - marker_pos == 80) {
+ marker_pos = avio_tell(s->pb);
+ if (state == 0xff3f0701 && avio_tell(s->pb) - marker_pos == 80) {
avio_seek(s->pb, -163, SEEK_CUR);
state = avio_rb32(s->pb);
break;