From ef8b54fc883e2a91cbca37b50904e1a0659bb121 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 15 Apr 2011 09:43:15 +0200 Subject: xwma demuxer: typos Signed-off-by: Diego Biurrun --- libavformat/xwma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/xwma.c') diff --git a/libavformat/xwma.c b/libavformat/xwma.c index ba2ee05395..9b5777f085 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -90,7 +90,7 @@ static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) * codecs require extradata, so we provide our own fake extradata. * * First, check that there really was no extradata in the header. If - * there was, then try to use, after asking the the user to provide a + * there was, then try to use it, after asking the user to provide a * sample of this unusual file. */ if (st->codec->extradata_size != 0) { @@ -129,7 +129,7 @@ static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) /* Quoting the MSDN xWMA docs on the dpds chunk: "Contains the * decoded packet cumulative data size array, each element is the * number of bytes accumulated after the corresponding xWMA packet - * is decoded in order" + * is decoded in order." * * Each packet has size equal to st->codec->block_align, which in * all cases I saw so far was always 2230. Thus, we can use the -- cgit v1.2.3 From 4d012eb541ed7f35e00c87035a470d9f0a24a6e8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 15 Apr 2011 13:28:04 +0200 Subject: xwma: Fix wrong printf format expression. Also add inttypes.h #include for PRId64 macros. This fixes the following warnings: libavformat/xwma.c:147: warning: too many arguments for format libavformat/xwma.c:151: warning: too many arguments for format --- libavformat/xwma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libavformat/xwma.c') diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 9b5777f085..d18ab48795 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "avformat.h" #include "riff.h" @@ -144,11 +146,13 @@ static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) /* Compute the number of entries in the dpds chunk. */ if (size & 3) { /* Size should be divisible by four */ - av_log(s, AV_LOG_WARNING, "dpds chunk size "PRId64" not divisible by 4\n", size); + av_log(s, AV_LOG_WARNING, + "dpds chunk size %"PRId64" not divisible by 4\n", size); } dpds_table_size = size / 4; if (dpds_table_size == 0 || dpds_table_size >= INT_MAX / 4) { - av_log(s, AV_LOG_ERROR, "dpds chunk size "PRId64" invalid\n", size); + av_log(s, AV_LOG_ERROR, + "dpds chunk size %"PRId64" invalid\n", size); return -1; } -- cgit v1.2.3