diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:25:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 12:25:16 +0200 |
| commit | 856e7dbb7251cb772835c6b3e57b09872b62c6db (patch) | |
| tree | c6c7b065f2e8fa9c715adefef38b0a207740fe1f /libavformat/apetag.c | |
| parent | 4abd5a431823e4f816c2295d9086b725df1f0358 (diff) | |
| parent | e816aaacd68201b67182f9c70dc680e89a0123e9 (diff) | |
| download | ffmpeg-856e7dbb7251cb772835c6b3e57b09872b62c6db.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
apetag: use int64_t for filesize
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apetag.c')
| -rw-r--r-- | libavformat/apetag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index c89b78d3a2..e0b56be7c8 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -116,7 +116,7 @@ static int ape_tag_read_field(AVFormatContext *s) int64_t ff_ape_parse_tag(AVFormatContext *s) { AVIOContext *pb = s->pb; - int file_size = avio_size(pb); + int64_t file_size = avio_size(pb); uint32_t val, fields, tag_bytes; uint8_t buf[8]; int64_t tag_start; |