diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-03-04 21:57:36 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-08 04:09:21 +0300 |
commit | db44ea960d9b692e9683fffb13656a47d4166ac3 (patch) | |
tree | 7d0eefbcd46dad56be7393987b60eeb07a4fc46a /libavformat/mov.c | |
parent | 1447dc59de9f179a99a91ca9a9d210d918b90486 (diff) |
avio: avio_ prefix for url_fsize
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index be799a4fdc..d3e95980a9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -304,7 +304,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (err < 0) return err; if (c->found_moov && c->found_mdat && - (url_is_streamed(pb) || start_pos + a.size == url_fsize(pb))) + (url_is_streamed(pb) || start_pos + a.size == avio_size(pb))) return 0; left = a.size - avio_tell(pb) + start_pos; if (left > 0) /* skip garbage at atom end */ @@ -2351,7 +2351,7 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) mov->fc = s; /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ if(!url_is_streamed(pb)) - atom.size = url_fsize(pb); + atom.size = avio_size(pb); else atom.size = INT64_MAX; |