aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-26 21:35:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-26 22:12:20 +0100
commit084bd109fcaaddd30d90601aff1f987abebadbfb (patch)
treeb3de964ec86c6d218bf7732945d71d13df28b03a
parent7e09fe15d5d0eb021b6932330e2728fb026df2c0 (diff)
downloadffmpeg-084bd109fcaaddd30d90601aff1f987abebadbfb.tar.gz
id3v2: fix variable type for uncompress()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/id3v2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 60a780c97f..9ee327169a 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -486,7 +486,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
int tunsync = 0;
int tcomp = 0;
int tencr = 0;
- int dlen;
+ unsigned long dlen;
if (isv34) {
avio_read(s->pb, tag, 4);
@@ -547,14 +547,14 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
av_fast_malloc(&buffer, &buffer_size, dlen);
if (!buffer) {
- av_log(s, AV_LOG_ERROR, "Failed to alloc %d bytes\n", dlen);
+ av_log(s, AV_LOG_ERROR, "Failed to alloc %ld bytes\n", dlen);
goto seek;
}
#if CONFIG_ZLIB
if (tcomp) {
int n, err;
- av_log(s, AV_LOG_DEBUG, "Compresssed frame %s tlen=%d dlen=%d\n", tag, tlen, dlen);
+ av_log(s, AV_LOG_DEBUG, "Compresssed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen);
av_fast_malloc(&compressed_buffer, &compressed_buffer_size, tlen);
if (!compressed_buffer) {