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/idroqdec.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/idroqdec.c')
| -rw-r--r-- | libavformat/idroqdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index 71324d8803..391db609b7 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -141,7 +141,7 @@ static int roq_read_packet(AVFormatContext *s, case RoQ_QUAD_CODEBOOK: /* packet needs to contain both this codebook and next VQ chunk */ - codebook_offset = url_ftell(pb) - RoQ_CHUNK_PREAMBLE_SIZE; + codebook_offset = avio_tell(pb) - RoQ_CHUNK_PREAMBLE_SIZE; codebook_size = chunk_size; avio_seek(pb, codebook_size, SEEK_CUR); if (avio_read(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) != @@ -197,7 +197,7 @@ static int roq_read_packet(AVFormatContext *s, roq->audio_frame_count += (chunk_size / roq->audio_channels); } - pkt->pos= url_ftell(pb); + pkt->pos= avio_tell(pb); ret = avio_read(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE, chunk_size); if (ret != chunk_size) |