diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-03 20:11:45 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-04 11:26:57 -0500 |
| commit | a2704c9712ad35cc22e7e0d8a79b581c07fa383b (patch) | |
| tree | ebf5a27a98dbd52d983e38e901661f7525b38e9a /libavformat/ipmovie.c | |
| parent | e16ead0716c2f988d1e26369a4c67b354ff86134 (diff) | |
avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/ipmovie.c')
| -rw-r--r-- | libavformat/ipmovie.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index e02e00b15a..b54df38b23 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -405,7 +405,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, debug_ipmovie("audio frame\n"); /* log position and move on for now */ - s->audio_chunk_offset = url_ftell(pb); + s->audio_chunk_offset = avio_tell(pb); s->audio_chunk_size = opcode_size; avio_seek(pb, opcode_size, SEEK_CUR); break; @@ -471,7 +471,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, debug_ipmovie("set decoding map\n"); /* log position and move on for now */ - s->decode_map_chunk_offset = url_ftell(pb); + s->decode_map_chunk_offset = avio_tell(pb); s->decode_map_chunk_size = opcode_size; avio_seek(pb, opcode_size, SEEK_CUR); break; @@ -480,7 +480,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, debug_ipmovie("set video data\n"); /* log position and move on for now */ - s->video_chunk_offset = url_ftell(pb); + s->video_chunk_offset = avio_tell(pb); s->video_chunk_size = opcode_size; avio_seek(pb, opcode_size, SEEK_CUR); break; @@ -494,7 +494,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, } /* make a note of where the stream is sitting */ - s->next_chunk_offset = url_ftell(pb); + s->next_chunk_offset = avio_tell(pb); /* dispatch the first of any pending packets */ if ((chunk_type == CHUNK_VIDEO) || (chunk_type == CHUNK_AUDIO_ONLY)) @@ -541,7 +541,7 @@ static int ipmovie_read_header(AVFormatContext *s, ipmovie->decode_map_chunk_offset = 0; /* on the first read, this will position the stream at the first chunk */ - ipmovie->next_chunk_offset = url_ftell(pb) + 4; + ipmovie->next_chunk_offset = avio_tell(pb) + 4; /* process the first chunk which should be CHUNK_INIT_VIDEO */ if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_VIDEO) |