Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apetag: use int64_t for filesize

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index c89b78d3a2af65de42055cbb5c20824a7a194de6..e0b56be7c8136b0abd1f9d92099f99a2bb8d42f3 100644 (file)
--- 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;