diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-04 19:57:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-08 02:09:21 +0100 |
| commit | db44ea960d9b692e9683fffb13656a47d4166ac3 (patch) | |
| tree | 7d0eefbcd46dad56be7393987b60eeb07a4fc46a /libavformat/avidec.c | |
| parent | 1447dc59de9f179a99a91ca9a9d210d918b90486 (diff) | |
| download | ffmpeg-db44ea960d9b692e9683fffb13656a47d4166ac3.tar.gz | |
avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 79e86ad613..83b86d8146 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -138,7 +138,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){ AVIStream *ast; int i; int64_t last_pos= -1; - int64_t filesize= url_fsize(s->pb); + int64_t filesize= avio_size(s->pb); #ifdef DEBUG_SEEK av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n", @@ -351,7 +351,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if (get_riff(s, pb) < 0) return -1; - avi->fsize = url_fsize(pb); + avi->fsize = avio_size(pb); if(avi->fsize<=0) avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end; @@ -378,7 +378,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if (tag1 == MKTAG('m', 'o', 'v', 'i')) { avi->movi_list = avio_tell(pb) - 4; if(size) avi->movi_end = avi->movi_list + size + (size & 1); - else avi->movi_end = url_fsize(pb); + else avi->movi_end = avio_size(pb); av_dlog(NULL, "movi end=%"PRIx64"\n", avi->movi_end); goto end_of_header; } @@ -705,7 +705,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " "I will ignore it and try to continue anyway.\n"); avi->movi_list = avio_tell(pb) - 4; - avi->movi_end = url_fsize(pb); + avi->movi_end = avio_size(pb); goto end_of_header; } /* skip tag */ |