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/mpeg.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/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a1ba6aa203..740dbc94c0 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -169,7 +169,7 @@ static int find_prev_start_code(AVIOContext *pb, int *size_ptr) int max_size, start_code; max_size = *size_ptr; - pos_start = url_ftell(pb); + pos_start = avio_tell(pb); /* in order to go faster, we fill the buffer */ pos = pos_start - 16386; @@ -241,7 +241,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, int len, size, startcode, c, flags, header_len; int pes_ext, ext2_len, id_ext, skip; int64_t pts, dts; - int64_t last_sync= url_ftell(s->pb); + int64_t last_sync= avio_tell(s->pb); error_redo: avio_seek(s->pb, last_sync, SEEK_SET); @@ -250,8 +250,8 @@ static int mpegps_read_pes_header(AVFormatContext *s, m->header_state = 0xff; size = MAX_SYNC_SIZE; startcode = find_next_start_code(s->pb, &size, &m->header_state); - last_sync = url_ftell(s->pb); - //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, url_ftell(s->pb)); + last_sync = avio_tell(s->pb); + //printf("startcode=%x pos=0x%"PRIx64"\n", startcode, avio_tell(s->pb)); if (startcode < 0){ if(url_feof(s->pb)) return AVERROR_EOF; @@ -295,7 +295,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, (startcode == 0x1bd) || (startcode == 0x1fd))) goto redo; if (ppos) { - *ppos = url_ftell(s->pb) - 4; + *ppos = avio_tell(s->pb) - 4; } len = avio_rb16(s->pb); pts = |