summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2015-12-15 10:50:18 +0100
committerDiego Biurrun <diego@biurrun.de>2016-10-28 11:22:21 +0200
commit1263b2039eb5aaf1522e9de9f07c787ab30a5f50 (patch)
tree476a8f24a973d1ed48c1bf0851777d2363008090 /libavcodec
parentca1e5eea0c7b72a6e30aa6488cfeced3a4853521 (diff)
Adjust printf conversion specifiers to match variable signedness
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dnxhddec.c10
-rw-r--r--libavcodec/dvdec.c2
-rw-r--r--libavcodec/dxv.c2
-rw-r--r--libavcodec/fraps.c2
-rw-r--r--libavcodec/txd.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 50747ea489..052f3d0c2b 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -138,7 +138,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
ctx->height = AV_RB16(buf + 0x18);
ctx->width = AV_RB16(buf + 0x1a);
- ff_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
+ ff_dlog(ctx->avctx, "width %u, height %u\n", ctx->width, ctx->height);
if (buf[0x21] == 0x58) { /* 10 bit */
ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 10;
@@ -185,7 +185,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
}
if (buf_size < ctx->cid_table->coding_unit_size) {
- av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %d).\n",
+ av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %u).\n",
buf_size, ctx->cid_table->coding_unit_size);
return AVERROR_INVALIDDATA;
}
@@ -194,7 +194,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
ctx->mb_height = buf[0x16d];
ff_dlog(ctx->avctx,
- "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height);
+ "mb width %u, mb height %u\n", ctx->mb_width, ctx->mb_height);
if ((ctx->height + 15) >> 4 == ctx->mb_height && frame->interlaced_frame)
ctx->height <<= 1;
@@ -202,7 +202,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
if (ctx->mb_height > 68 ||
(ctx->mb_height << frame->interlaced_frame) > (ctx->height + 15) >> 4) {
av_log(ctx->avctx, AV_LOG_ERROR,
- "mb height too big: %d\n", ctx->mb_height);
+ "mb height too big: %u\n", ctx->mb_height);
return AVERROR_INVALIDDATA;
}
@@ -442,7 +442,7 @@ decode_coding_unit:
if ((avctx->width || avctx->height) &&
(ctx->width != avctx->width || ctx->height != avctx->height)) {
- av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %dx%d\n",
+ av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %ux%u\n",
avctx->width, avctx->height, ctx->width, ctx->height);
first_field = 1;
}
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index eca3b86d0f..777725d018 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -102,7 +102,7 @@ static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, int16_t *block)
/* get the AC coefficients until last_index is reached */
for (;;) {
- ff_dlog(NULL, "%2d: bits=%04x index=%d\n", pos, SHOW_UBITS(re, gb, 16),
+ ff_dlog(NULL, "%2d: bits=%04x index=%u\n", pos, SHOW_UBITS(re, gb, 16),
re_index);
/* our own optimized GET_RL_VLC */
index = NEG_USR32(re_cache, TEX_VLC_BITS);
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index 99327dface..e96ab44e35 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -421,7 +421,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
if (size != bytestream2_get_bytes_left(gbc)) {
av_log(avctx, AV_LOG_ERROR,
- "Incomplete or invalid file (header %d, left %d).\n",
+ "Incomplete or invalid file (header %d, left %u).\n",
size, bytestream2_get_bytes_left(gbc));
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index eb61c70c49..c4ec23e281 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -164,7 +164,7 @@ static int decode_frame(AVCodecContext *avctx,
if (version > 5) {
av_log(avctx, AV_LOG_ERROR,
- "This file is encoded with Fraps version %d. " \
+ "This file is encoded with Fraps version %u. "
"This codec can only decode versions <= 5.\n", version);
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 463223c963..ac46608f61 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -56,7 +56,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
flags = bytestream2_get_byte(&gb);
if (version < 8 || version > 9) {
- av_log(avctx, AV_LOG_ERROR, "texture data version %i is unsupported\n",
+ av_log(avctx, AV_LOG_ERROR, "texture data version %u is unsupported\n",
version);
return AVERROR_PATCHWELCOME;
}
@@ -66,7 +66,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} else if (depth == 16 || depth == 32) {
avctx->pix_fmt = AV_PIX_FMT_RGBA;
} else {
- av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth);
+ av_log(avctx, AV_LOG_ERROR, "depth of %u is unsupported\n", depth);
return AVERROR_PATCHWELCOME;
}