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/iss.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/iss.c')
| -rw-r--r-- | libavformat/iss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/iss.c b/libavformat/iss.c index 04bb1c52d4..8d225108ad 100644 --- a/libavformat/iss.c +++ b/libavformat/iss.c @@ -87,7 +87,7 @@ static av_cold int iss_read_header(AVFormatContext *s, AVFormatParameters *ap) get_token(pb, token, sizeof(token)); //Version ID get_token(pb, token, sizeof(token)); //Size - iss->sample_start_pos = url_ftell(pb); + iss->sample_start_pos = avio_tell(pb); st = av_new_stream(s, 0); if (!st) @@ -116,7 +116,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); pkt->stream_index = 0; - pkt->pts = url_ftell(s->pb) - iss->sample_start_pos; + pkt->pts = avio_tell(s->pb) - iss->sample_start_pos; if(s->streams[0]->codec->channels > 0) pkt->pts /= s->streams[0]->codec->channels*2; return 0; |