aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-27 21:31:46 +0200
committerClément Bœsch <u@pkh.me>2017-03-29 14:49:29 +0200
commit549045254c4614d5d61b5c36e340171a6914d57c (patch)
tree0d2d80d1ca0c3de65f45da198e8ab09921da7fe4 /libavfilter
parent1473afac5d11a0a90810b6cd8107d63640c9fd38 (diff)
downloadffmpeg-549045254c4614d5d61b5c36e340171a6914d57c.tar.gz
Fix all -Wformat warnings raised by DJGPP
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_hdcd.c7
-rw-r--r--libavfilter/f_perms.c2
-rw-r--r--libavfilter/vf_palettegen.c2
-rw-r--r--libavfilter/vf_paletteuse.c4
-rw-r--r--libavfilter/vsrc_cellauto.c2
-rw-r--r--libavfilter/vsrc_life.c2
6 files changed, 11 insertions, 8 deletions
diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 1248fd9b75..2800ed9d80 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -1077,7 +1077,8 @@ static int hdcd_integrate(HDCDContext *ctx, hdcd_state *states, int channels, in
/* one of bits 3, 6, or 7 was not 0 */
states[i].code_counterA_almost++;
av_log(ctx->fctx, AV_LOG_VERBOSE,
- "hdcd error: Control A almost: 0x%02x near %d\n", wbits & 0xff, ctx->sample_count);
+ "hdcd error: Control A almost: 0x%02"PRIx32" near %d\n",
+ wbits & 0xff, ctx->sample_count);
}
} else if ((wbits & 0xa0060000) == 0xa0060000) {
/* B: 8-bit code, 8-bit XOR check, 0x7e0fa006[....] */
@@ -1091,7 +1092,9 @@ static int hdcd_integrate(HDCDContext *ctx, hdcd_state *states, int channels, in
/* XOR check failed */
states[i].code_counterB_checkfails++;
av_log(ctx->fctx, AV_LOG_VERBOSE,
- "hdcd error: Control B check failed: 0x%04x (0x%02x vs 0x%02x) near %d\n", wbits & 0xffff, (wbits & 0xff00) >> 8, ~wbits & 0xff, ctx->sample_count);
+ "hdcd error: Control B check failed: 0x%04"PRIx32
+ " (0x%02"PRIx32" vs 0x%02"PRIx32") near %d\n",
+ wbits & 0xffff, (wbits & 0xff00) >> 8, ~wbits & 0xff, ctx->sample_count);
}
}
if (f) {
diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c
index 40b8811149..da11d506a7 100644
--- a/libavfilter/f_perms.c
+++ b/libavfilter/f_perms.c
@@ -64,7 +64,7 @@ static av_cold int init(AVFilterContext *ctx)
if (s->random_seed == -1)
s->random_seed = av_get_random_seed();
seed = s->random_seed;
- av_log(ctx, AV_LOG_INFO, "random seed: 0x%08x\n", seed);
+ av_log(ctx, AV_LOG_INFO, "random seed: 0x%08"PRIx32"\n", seed);
av_lfg_init(&s->lfg, seed);
}
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c
index 5e69873b4c..b470079ccc 100644
--- a/libavfilter/vf_palettegen.c
+++ b/libavfilter/vf_palettegen.c
@@ -239,7 +239,7 @@ static void write_palette(AVFilterContext *ctx, AVFrame *out)
if (box_id < s->nb_boxes) {
pal[x] = s->boxes[box_id++].color;
if ((x || y) && pal[x] == last_color)
- av_log(ctx, AV_LOG_WARNING, "Dupped color: %08X\n", pal[x]);
+ av_log(ctx, AV_LOG_WARNING, "Dupped color: %08"PRIX32"\n", pal[x]);
last_color = pal[x];
} else {
pal[x] = 0xff000000; // pad with black
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index 69d3be92da..e8dde572cd 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -491,7 +491,7 @@ static void disp_node(AVBPrint *buf,
av_bprintf(buf, "%*cnode%d ["
"label=\"%c%02X%c%02X%c%02X%c\" "
"fillcolor=\"#%02x%02x%02x\" "
- "fontcolor=\"#%06X\"]\n",
+ "fontcolor=\"#%06"PRIX32"\"]\n",
depth*INDENT, ' ', node->palette_id,
"[ "[node->split], node->val[0],
"][ "[node->split], node->val[1],
@@ -552,7 +552,7 @@ static int debug_accuracy(const struct color_node *node, const uint32_t *palette
const int d2 = diff(palrgb2, rgb);
if (d1 != d2) {
av_log(NULL, AV_LOG_ERROR,
- "/!\\ %02X%02X%02X: %d ! %d (%06X ! %06X) / dist: %d ! %d\n",
+ "/!\\ %02X%02X%02X: %d ! %d (%06"PRIX32" ! %06"PRIX32") / dist: %d ! %d\n",
r, g, b, r1, r2, c1 & 0xffffff, c2 & 0xffffff, d1, d2);
ret = 1;
}
diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c
index 4961f762f4..afdceff7f1 100644
--- a/libavfilter/vsrc_cellauto.c
+++ b/libavfilter/vsrc_cellauto.c
@@ -199,7 +199,7 @@ static av_cold int init(AVFilterContext *ctx)
}
av_log(ctx, AV_LOG_VERBOSE,
- "s:%dx%d r:%d/%d rule:%d stitch:%d scroll:%d full:%d seed:%u\n",
+ "s:%dx%d r:%d/%d rule:%d stitch:%d scroll:%d full:%d seed:%"PRIu32"\n",
s->w, s->h, s->frame_rate.num, s->frame_rate.den,
s->rule, s->stitch, s->scroll, s->start_full,
s->random_seed);
diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index 8d51051487..afe805a675 100644
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -260,7 +260,7 @@ static av_cold int init(AVFilterContext *ctx)
}
av_log(ctx, AV_LOG_VERBOSE,
- "s:%dx%d r:%d/%d rule:%s stay_rule:%d born_rule:%d stitch:%d seed:%u\n",
+ "s:%dx%d r:%d/%d rule:%s stay_rule:%d born_rule:%d stitch:%d seed:%"PRIu32"\n",
life->w, life->h, life->frame_rate.num, life->frame_rate.den,
life->rule_str, life->stay_rule, life->born_rule, life->stitch,
life->random_seed);