From 75c553eb264ca9317fded0350684d561035a6794 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 26 Feb 2012 23:42:37 +0100 Subject: rmdec: adjust printf format string specifier to fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libavformat/rmdec.c:383: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘int64_t’ --- libavformat/rmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 6775294..a5e6d2d 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -378,7 +378,7 @@ static int rm_read_index(AVFormatContext *s) } else if ((avio_size(pb) - avio_tell(pb)) / 14 < n_pkts) { av_log(s, AV_LOG_ERROR, "Nr. of packets in packet index for stream index %d " - "exceeds filesize (%"PRId64" at %"PRId64" = %d)\n", + "exceeds filesize (%"PRId64" at %"PRId64" = %"PRId64")\n", str_id, avio_size(pb), avio_tell(pb), (avio_size(pb) - avio_tell(pb)) / 14); goto skip; -- cgit v1.1 From 1697c29d75942f1306e76e3c6486e1b822a5b437 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 1 Mar 2012 16:47:54 -0800 Subject: rmdec: Honor .RMF tag size rather than assuming 18. --- libavformat/rmdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index a5e6d2d..ae6cd0b 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -438,10 +438,8 @@ static int rm_read_header(AVFormatContext *s) return AVERROR(EIO); } - avio_rb32(pb); /* header size */ - avio_rb16(pb); - avio_rb32(pb); - avio_rb32(pb); /* number of headers */ + tag_size = avio_rb32(pb); + avio_skip(pb, tag_size - 8); for(;;) { if (pb->eof_reached) -- cgit v1.1