diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-03 20:11:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-05 02:29:31 +0100 |
commit | 384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790 (patch) | |
tree | a3ec8979530bffeb61b84161d1681120bf1234af /libavformat/aiffdec.c | |
parent | 773947ba76c575abc01ba128206c87440dad40ec (diff) | |
download | ffmpeg-384c9c2fa79f2f09ed4a5aa4c14ba3ffc6bdc790.tar.gz |
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/aiffdec.c')
-rw-r--r-- | libavformat/aiffdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 849793a14b..9e3d39c371 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -232,10 +232,10 @@ static int aiff_read_header(AVFormatContext *s, get_meta(s, "comment" , size); break; case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */ - aiff->data_end = url_ftell(pb) + size; + aiff->data_end = avio_tell(pb) + size; offset = avio_rb32(pb); /* Offset of sound data */ avio_rb32(pb); /* BlockSize... don't care */ - offset += url_ftell(pb); /* Compute absolute data offset */ + offset += avio_tell(pb); /* Compute absolute data offset */ if (st->codec->block_align) /* Assume COMM already parsed */ goto got_sound; if (url_is_streamed(pb)) { @@ -292,7 +292,7 @@ static int aiff_read_packet(AVFormatContext *s, int res, size; /* calculate size of remaining data */ - max_size = aiff->data_end - url_ftell(s->pb); + max_size = aiff->data_end - avio_tell(s->pb); if (max_size <= 0) return AVERROR_EOF; |