diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 847b620bf905a418ea1a840678a17da7d54f62f9..44547c94e70576fbce1e181960bfc34bc3a0e9ce 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -98,7 +98,6 @@ Stuff that didn't reach the codebase:
- Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html)
- Use the new bitstream filter for extracting extradata (see 8e2ea69135 and 096a8effa3)
- ADD_RES_MMX_4_8 in libavcodec/x86/hevc_add_res.asm probably needs updating (see 589880710)
-- ISO printf warnings raised by DJGPP (c454dfcff9, currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209239.html)
Collateral damage that needs work locally:
------------------------------------------
diff --git a/ffmpeg.c b/ffmpeg.c
index 3aa1e7854da513389394efda7dca6093014769ed..41c709d6813a7657d9e65d75ae2d9052c8b30efd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2509,7 +2509,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output,
1000, AV_TIME_BASE);
if (end < ist->prev_sub.subtitle.end_display_time) {
av_log(ist->dec_ctx, AV_LOG_DEBUG,
- "Subtitle duration reduced from %d to %d%s\n",
+ "Subtitle duration reduced from %"PRId32" to %d%s\n",
ist->prev_sub.subtitle.end_display_time, end,
end <= 0 ? ", dropping it" : "");
ist->prev_sub.subtitle.end_display_time = end;
diff --git a/ffprobe.c b/ffprobe.c
index 4d5270feb6f6a97c9f38e172587aaa2e2ddca83e..77ea3494d264425aef080076da05c054810f9e0f 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -2383,7 +2383,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
/* print AVI/FourCC tag */
print_str("codec_tag_string", av_fourcc2str(par->codec_tag));
- print_fmt("codec_tag", "0x%04x", par->codec_tag);
+ print_fmt("codec_tag", "0x%04"PRIx32, par->codec_tag);
switch (par->codec_type) {
case AVMEDIA_TYPE_VIDEO:
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 3986347ee2e9116d4f6fff71e2f8c1d916c7b725..d95e30d10d3f2f260b710446a5fa1bbcc13139b4 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1500,7 +1500,7 @@ static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) {
tmp_32 = ff_mlz_decompression(ctx->mlz, gb, nchars, larray);
if(tmp_32 != nchars) {
- av_log(ctx->avctx, AV_LOG_ERROR, "Error in MLZ decompression (%d, %d).\n", tmp_32, nchars);
+ av_log(ctx->avctx, AV_LOG_ERROR, "Error in MLZ decompression (%"PRId32", %d).\n", tmp_32, nchars);
return AVERROR_INVALIDDATA;
}
@@ -1543,7 +1543,7 @@ static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) {
tmp_32 = ff_mlz_decompression(ctx->mlz, gb, nchars, larray);
if(tmp_32 != nchars) {
- av_log(ctx->avctx, AV_LOG_ERROR, "Error in MLZ decompression (%d, %d).\n", tmp_32, nchars);
+ av_log(ctx->avctx, AV_LOG_ERROR, "Error in MLZ decompression (%"PRId32", %d).\n", tmp_32, nchars);
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index b99598b4ee74ed3b5ac762a5f1a980824455fa07..a6b14b8e247c7ec84f346e4581f9d38146139281 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -495,7 +495,7 @@ static inline int ape_decode_value_3860(APEContext *ctx, GetBitContext *gb,
else if(rice->k <= MIN_CACHE_BITS) {
x = (overflow << rice->k) + get_bits(gb, rice->k);
} else {
- av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %d\n", rice->k);
+ av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %"PRIu32"\n", rice->k);
return AVERROR_INVALIDDATA;
}
rice->ksum += x - (rice->ksum + 8 >> 4);
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 69deabe7701087e36921280f9756119c31512ac2..ed528fe4af7d1d75eafe537467fd3ee881bc3796 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -176,7 +176,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
n = codes[i].bits;
code = codes[i].code;
symbol = codes[i].symbol;
- ff_dlog(NULL, "i=%d n=%d code=0x%x\n", i, n, code);
+ ff_dlog(NULL, "i=%d n=%d code=0x%"PRIx32"\n", i, n, code);
if (n <= table_nb_bits) {
/* no need to add another table */
j = code >> (32 - table_nb_bits);
@@ -310,7 +310,8 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes,
} \
GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size); \
if (buf[j].code >= (1LL<<buf[j].bits)) { \
- av_log(NULL, AV_LOG_ERROR, "Invalid code %x for %d in init_vlc\n", buf[j].code, i);\
+ av_log(NULL, AV_LOG_ERROR, "Invalid code %"PRIx32" for %d in " \
+ "init_vlc\n", buf[j].code, i); \
if (!(flags & INIT_VLC_USE_NEW_STATIC)) \
av_free(buf); \
return -1; \
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index d462385ca8afacd172e95eb719fa220881994d48..1308ec005f4c5a4450737c3cefa0e2532215780c 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -149,7 +149,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
else if (rgb[0] == 0x000000FF && rgb[1] == 0x0000FF00 && rgb[2] == 0x00FF0000)
avctx->pix_fmt = alpha ? AV_PIX_FMT_RGBA : AV_PIX_FMT_RGB0;
else {
- av_log(avctx, AV_LOG_ERROR, "Unknown bitfields %0X %0X %0X\n", rgb[0], rgb[1], rgb[2]);
+ av_log(avctx, AV_LOG_ERROR, "Unknown bitfields "
+ "%0"PRIX32" %0"PRIX32" %0"PRIX32"\n", rgb[0], rgb[1], rgb[2]);
return AVERROR(EINVAL);
}
} else {
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 305fd52daa4a087190103de9f7584d30dd5d4659..f67763ef47e8f60de896811f7b3ce9120cb52c9c 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -111,7 +111,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)
int index;
if ((index = ff_dnxhd_get_cid_table(cid)) < 0) {
- av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
+ av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %"PRIu32"\n", cid);
return AVERROR(ENOSYS);
}
if (ff_dnxhd_cid_table[index].bit_depth != bitdepth &&
@@ -120,7 +120,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)
return AVERROR_INVALIDDATA;
}
ctx->cid_table = &ff_dnxhd_cid_table[index];
- av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);
+ av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %"PRIu32".\n", cid);
ff_free_vlc(&ctx->ac_vlc);
ff_free_vlc(&ctx->dc_vlc);
@@ -316,10 +316,11 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
for (i = 0; i < ctx->mb_height; i++) {
ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i << 2));
- ff_dlog(ctx->avctx, "mb scan index %d, pos %d: %u\n", i, 0x170 + (i << 2), ctx->mb_scan_index[i]);
+ ff_dlog(ctx->avctx, "mb scan index %d, pos %d: %"PRIu32"\n",
+ i, 0x170 + (i << 2), ctx->mb_scan_index[i]);
if (buf_size - ctx->data_offset < ctx->mb_scan_index[i]) {
av_log(ctx->avctx, AV_LOG_ERROR,
- "invalid mb scan index (%u vs %u).\n",
+ "invalid mb scan index (%"PRIu32" vs %u).\n",
ctx->mb_scan_index[i], buf_size - ctx->data_offset);
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index a8d7a07ae471f2d204ab190e06a8c5d86b1b52b6..7b16787e2745cf34315d68207c844952ecfde413 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -222,8 +222,8 @@ 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=%u\n", pos, SHOW_UBITS(re, gb, 16),
- re_index);
+ ff_dlog(NULL, "%2d: bits=%04"PRIx32" 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);
vlc_len = ff_dv_rl_vlc[index].len;
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index e91d63ea295c7d2abd3b8a9a2f5e5fb6e543cb4e..22ce728ea6f964d36ea2e0313d75e74da4623486 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -747,7 +747,7 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
int i;
av_log(avctx, AV_LOG_DEBUG, "palette:");
for(i=0;i<16;i++)
- av_log(avctx, AV_LOG_DEBUG, " 0x%06x", ctx->palette[i]);
+ av_log(avctx, AV_LOG_DEBUG, " 0x%06"PRIx32, ctx->palette[i]);
av_log(avctx, AV_LOG_DEBUG, "\n");
}
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 29e0322daac25d0809e665af708a538675151e97..26afdc666b4304604e0bfead205a30c72b72d8c1 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -343,7 +343,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log(avctx, AV_LOG_DEBUG, "Selected palette:");
for (i = 0; i < 4; i++)
- av_log(avctx, AV_LOG_DEBUG, " 0x%06x@@%02x (0x%x,0x%x)",
+ av_log(avctx, AV_LOG_DEBUG, " 0x%06"PRIx32"@@%02x (0x%x,0x%x)",
dvdc->global_palette[out_palette[i]], out_alpha[i],
out_palette[i], out_alpha[i] >> 4);
av_log(avctx, AV_LOG_DEBUG, "\n");
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index b1f826ac41ccb4b2833e2329bea8d9f2dc51c6e6..4b1c2d25ccfa0ae823602b12595159514d1dfc03 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -374,7 +374,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
break;
case MKBETAG('Y', 'C', 'G', '6'):
case MKBETAG('Y', 'G', '1', '0'):
- avpriv_report_missing_feature(avctx, "Tag 0x%08X", tag);
+ avpriv_report_missing_feature(avctx, "Tag 0x%08"PRIX32, tag);
return AVERROR_PATCHWELCOME;
default:
/* Old version does not have a real header, just size and type. */
@@ -401,7 +401,7 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
ctx->tex_funct = ctx->texdsp.dxt1_block;
ctx->tex_step = 8;
} else {
- av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08X)\n.", tag);
+ av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08"PRIX32")\n.", tag);
return AVERROR_INVALIDDATA;
}
ctx->tex_rat = 1;
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 7f1bc4fcf43bfb41aa03d8dbd1463c6f9eda5a38..1a5076717126f4dd6baa0275089f3f5bad7ec062 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -870,7 +870,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
fs->slice_damaged = 1;
}
if (avctx->debug & FF_DEBUG_PICT_INFO) {
- av_log(avctx, AV_LOG_DEBUG, "slice %d, CRC: 0x%08X\n", i, AV_RB32(buf_p + v - 4));
+ av_log(avctx, AV_LOG_DEBUG, "slice %d, CRC: 0x%08"PRIX32"\n", i, AV_RB32(buf_p + v - 4));
}
}
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 287b24e832daa5497ec5cb9e02fcdff831d751d2..acd55cc513cf5ee77404a5e1bd5692b7822afe60 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -649,7 +649,7 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx,
vui->vui_num_units_in_tick = get_bits_long(gb, 32);
vui->vui_time_scale = get_bits_long(gb, 32);
if (alt) {
- av_log(avctx, AV_LOG_INFO, "Retry got %i/%i fps\n",
+ av_log(avctx, AV_LOG_INFO, "Retry got %"PRIu32"/%"PRIu32" fps\n",
vui->vui_time_scale, vui->vui_num_units_in_tick);
}
vui->vui_poc_proportional_to_timing_flag = get_bits1(gb);
diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
index 138d9604118c74ada6d4672573673a686d43903c..1bc123e6591792559943556b0032b2b7826e23ef 100644
--- a/libavcodec/hqx.c
+++ b/libavcodec/hqx.c
@@ -417,7 +417,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
info_tag = AV_RL32(src);
if (info_tag == MKTAG('I', 'N', 'F', 'O')) {
- unsigned info_offset = AV_RL32(src + 4);
+ uint32_t info_offset = AV_RL32(src + 4);
if (info_offset > INT_MAX || info_offset + 8 > avpkt->size) {
av_log(avctx, AV_LOG_ERROR,
"Invalid INFO header offset: 0x%08"PRIX32" is too large.\n",
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 995e90879181455aa1865bc56159b9a54f4cdfb9..075ada6ddd1d1fae1b08b34e4a70bfa72744f252 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -934,7 +934,7 @@ static void decode_delta_j(uint8_t *dst,
offset = bytestream2_get_be16(&gb);
if (cols * bpp == 0 || bytestream2_get_bytes_left(&gb) < cols * bpp) {
- av_log(NULL, AV_LOG_ERROR, "cols*bpp is invalid (%d*%d)", cols, bpp);
+ av_log(NULL, AV_LOG_ERROR, "cols*bpp is invalid (%"PRId32"*%d)", cols, bpp);
return;
}
@@ -982,7 +982,7 @@ static void decode_delta_j(uint8_t *dst,
unsigned noffset = offset + (r * pitch) + d * planepitch;
if (!bytes || bytestream2_get_bytes_left(&gb) < bytes) {
- av_log(NULL, AV_LOG_ERROR, "bytes %d is invalid", bytes);
+ av_log(NULL, AV_LOG_ERROR, "bytes %"PRId32" is invalid", bytes);
return;
}
diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c
index e8d271931f46000b02a8d04711b4ac3531dc0939..4a34267793735fc78074cdde0401d7d0298ae91f 100644
--- a/libavcodec/microdvddec.c
+++ b/libavcodec/microdvddec.c
@@ -214,7 +214,7 @@ static void microdvd_open_tags(AVBPrint *new_line, struct microdvd_tag *tags)
break;
case 'c':
- av_bprintf(new_line, "{\\c&H%06X&}", tags[i].data1);
+ av_bprintf(new_line, "{\\c&H%06"PRIX32"&}", tags[i].data1);
break;
case 'f':
@@ -223,7 +223,7 @@ static void microdvd_open_tags(AVBPrint *new_line, struct microdvd_tag *tags)
break;
case 's':
- av_bprintf(new_line, "{\\fs%d}", tags[i].data1);
+ av_bprintf(new_line, "{\\fs%"PRId32"}", tags[i].data1);
break;
case 'p':
@@ -232,7 +232,7 @@ static void microdvd_open_tags(AVBPrint *new_line, struct microdvd_tag *tags)
break;
case 'o':
- av_bprintf(new_line, "{\\pos(%d,%d)}",
+ av_bprintf(new_line, "{\\pos(%"PRId32",%"PRId32")}",
tags[i].data1, tags[i].data2);
break;
}
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index ec109b3d4555962225422bcecc45a7a8ddb7e889..9cce88e263b730981feb49506b94ba32a121b732 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -280,7 +280,8 @@ static av_cold void decode_init_static(void)
scale_factor_mult[i][0] = MULLx(norm, FIXR(1.0 * 2.0), FRAC_BITS);
scale_factor_mult[i][1] = MULLx(norm, FIXR(0.7937005259 * 2.0), FRAC_BITS);
scale_factor_mult[i][2] = MULLx(norm, FIXR(0.6299605249 * 2.0), FRAC_BITS);
- ff_dlog(NULL, "%d: norm=%x s=%x %x %x\n", i, norm,
+ ff_dlog(NULL, "%d: norm=%x s=%"PRIx32" %"PRIx32" %"PRIx32"\n", i,
+ (unsigned)norm,
scale_factor_mult[i][0],
scale_factor_mult[i][1],
scale_factor_mult[i][2]);
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 30cfc55cbcb7f1525ceff13f67754e4be115a986..f87e8631b1654d93818261555b93ffc9ddf355c8 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -251,7 +251,7 @@ int ff_combine_frame(ParseContext *pc, int next,
const uint8_t **buf, int *buf_size)
{
if (pc->overread) {
- ff_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
+ ff_dlog(NULL, "overread %d, state:%"PRIX32" next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
ff_dlog(NULL, "%X %X %X %X\n",
(*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
@@ -314,7 +314,7 @@ int ff_combine_frame(ParseContext *pc, int next,
}
if (pc->overread) {
- ff_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
+ ff_dlog(NULL, "overread %d, state:%"PRIX32" next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
ff_dlog(NULL, "%X %X %X %X\n",
(*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index 1d4734d397deb6f1a273ca52178965895835cb4b..4aa59f8f33d233f57bf1f7ed1ecea0005448641d 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -324,7 +324,8 @@ static int read_highpass(AVCodecContext *avctx, uint8_t *ptr, int plane, AVFrame
magic = bytestream2_get_be32(&ctx->gb);
if (magic != 0xDEADBEEF) {
- av_log(avctx, AV_LOG_ERROR, "wrong magic number: 0x%08X for plane %d, band %d\n", magic, plane, i);
+ av_log(avctx, AV_LOG_ERROR, "wrong magic number: 0x%08"PRIX32
+ " for plane %d, band %d\n", magic, plane, i);
return AVERROR_INVALIDDATA;
}
@@ -575,7 +576,7 @@ static int pixlet_decode_frame(AVCodecContext *avctx, void *data,
pktsize = bytestream2_get_be32(&ctx->gb);
if (pktsize <= 44 || pktsize - 4 > bytestream2_get_bytes_left(&ctx->gb)) {
- av_log(avctx, AV_LOG_ERROR, "Invalid packet size %u.\n", pktsize);
+ av_log(avctx, AV_LOG_ERROR, "Invalid packet size %"PRIu32"\n", pktsize);
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index ff90d12c5c1ac7b117f823bf9fbe00668805bc66..3157c11da11ce85d81ac41fca933137c71ae712e 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -491,7 +491,8 @@ static int read_header(ShortenContext *s)
if ((ret = decode_aiff_header(s->avctx, s->header, s->header_size)) < 0)
return ret;
} else {
- avpriv_report_missing_feature(s->avctx, "unsupported bit packing %X", AV_RL32(s->header));
+ avpriv_report_missing_feature(s->avctx, "unsupported bit packing %"
+ PRIX32, AV_RL32(s->header));
return AVERROR_PATCHWELCOME;
}
diff --git a/libavcodec/tiff_common.c b/libavcodec/tiff_common.c
index 35119af558b642cb8694179b9b4a7ce85c8a9e05..0af62ee96219a9f8eba1ce80e32b0408e5b06fc2 100644
--- a/libavcodec/tiff_common.c
+++ b/libavcodec/tiff_common.c
@@ -97,7 +97,7 @@ int ff_tadd_rational_metadata(int count, const char *name, const char *sep,
for (i = 0; i < count; i++) {
nom = ff_tget_long(gb, le);
denom = ff_tget_long(gb, le);
- av_bprintf(&bp, "%s%7i:%-7i", auto_sep(count, sep, i, 4), nom, denom);
+ av_bprintf(&bp, "%s%7"PRId32":%-7"PRId32, auto_sep(count, sep, i, 4), nom, denom);
}
if ((i = av_bprint_finalize(&bp, &ap))) {
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 0a5eaa68794bc3b7ee9bd8313d0438487c0098cf..bc6c5875c2e80d3afc2fb244a955b138c8f0b130 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -731,7 +731,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
if (!res_setup->classifs)
return AVERROR(ENOMEM);
- ff_dlog(NULL, " begin %d end %d part.size %d classif.s %d classbook %d \n",
+ ff_dlog(NULL, " begin %"PRIu32" end %"PRIu32" part.size %d classif.s %d classbook %d \n",
res_setup->begin, res_setup->end, res_setup->partition_size,
res_setup->classifications, res_setup->classbook);
@@ -876,7 +876,7 @@ static int create_map(vorbis_context *vc, unsigned floor_number)
}
for (idx = 0; idx <= n; ++idx) {
- ff_dlog(NULL, "floor0 map: map at pos %d is %d\n", idx, map[idx]);
+ ff_dlog(NULL, "floor0 map: map at pos %d is %"PRId32"\n", idx, map[idx]);
}
return 0;
@@ -1012,7 +1012,7 @@ static int vorbis_parse_id_hdr(vorbis_context *vc)
if (!vc->fdsp)
return AVERROR(ENOMEM);
- ff_dlog(NULL, " vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ",
+ ff_dlog(NULL, " vorbis version %"PRIu32" \n audio_channels %"PRIu8" \n audio_samplerate %"PRIu32" \n bitrate_max %"PRIu32" \n bitrate_nom %"PRIu32" \n bitrate_min %"PRIu32" \n blk_0 %"PRIu32" blk_1 %"PRIu32" \n ",
vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]);
/*
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 5b1fe40a422e3639c4e2bead452d50032451feba..5c99628c52d28e868106ac849b3926bbab050ee8 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -701,7 +701,7 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
int i;
int offset = 0;
for (i = 0; i < s->channel[c].num_subframes; i++) {
- ff_dlog(s->avctx, "frame[%i] channel[%i] subframe[%i]"
+ ff_dlog(s->avctx, "frame[%"PRIu32"] channel[%i] subframe[%i]"
" len %i\n", s->frame_num, c, i,
s->channel[c].subframe_len[i]);
s->channel[c].subframe_offset[i] = offset;
diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 1248fd9b758975acccc2f9fabf03351e077bae9f..2800ed9d80857b8d929f2d6183e78bd9a45effdd 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 40b88111495230be4b52debffecf358e9bd6945f..da11d506a76e99ff8f1446eba5eb75de45c98af7 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 5e69873b4cf76b5357acb38bcd9ca6bf9cdee461..b470079ccc8f0945c560925266d96c36878962ce 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 69d3be92da8c3a14e9101d7b3fd23fc028853ca2..e8dde572cdc19dabfeef4a4c484c9a7bb7afe303 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 4961f762f42685045c1bbb2941cd0cd68748676d..afdceff7f10607211872ee71c8649705363e3a81 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 8d510514870c7d1a67b12f775a60b6fe2dd7868c..afe805a67521e55d493baa5c9ebd410e7bd49871 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);
diff --git a/libavformat/aadec.c b/libavformat/aadec.c
index 39dea40b80b2c7977042f30a1f7a5d074d7b3a80..8d39b1d9baa048c0084b7879043951026add2ce5 100644
--- a/libavformat/aadec.c
+++ b/libavformat/aadec.c
@@ -112,7 +112,8 @@ static int aa_read_header(AVFormatContext *s)
header_seed = atoi(val);
} else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890"
av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val);
- sscanf(val, "%u%u%u%u", &header_key_part[0], &header_key_part[1], &header_key_part[2], &header_key_part[3]);
+ sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32,
+ &header_key_part[0], &header_key_part[1], &header_key_part[2], &header_key_part[3]);
for (idx = 0; idx < 4; idx++) {
AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE!
}
diff --git a/libavformat/apngdec.c b/libavformat/apngdec.c
index e1ea29b713c332d58d2a09604e0f228406c6b65e..ffff03710a0e441b6ac8fc4c9c87ef5051360bf3 100644
--- a/libavformat/apngdec.c
+++ b/libavformat/apngdec.c
@@ -404,7 +404,7 @@ static int apng_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
return 0;
default:
- avpriv_request_sample(s, "In-stream tag=%s (0x%08X) len=%"PRIu32,
+ avpriv_request_sample(s, "In-stream tag=%s (0x%08"PRIX32") len=%"PRIu32,
av_fourcc2str(tag), tag, len);
avio_skip(pb, len + 4);
}
diff --git a/libavformat/astdec.c b/libavformat/astdec.c
index 7a53d0bb7080030764f83001fecd89289604cdb8..4ba08c21807d3c4049400b5c22b9dba634e0d489 100644
--- a/libavformat/astdec.c
+++ b/libavformat/astdec.c
@@ -102,7 +102,7 @@ static int ast_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = 0;
pkt->pos = pos;
} else {
- av_log(s, AV_LOG_ERROR, "unknown chunk %x\n", type);
+ av_log(s, AV_LOG_ERROR, "unknown chunk %"PRIx32"\n", type);
avio_skip(s->pb, size);
ret = AVERROR_INVALIDDATA;
}
diff --git a/libavformat/brstm.c b/libavformat/brstm.c
index 2e1cada158eda5ffa32a6ee1a91e62225d00ee14..87690e3f73e421ebf870edc15ae9417bf92ff4c5 100644
--- a/libavformat/brstm.c
+++ b/libavformat/brstm.c
@@ -230,7 +230,7 @@ static int read_header(AVFormatContext *s)
b->current_block = 0;
b->block_count = read32(s);
if (b->block_count > UINT16_MAX) {
- av_log(s, AV_LOG_WARNING, "too many blocks: %u\n", b->block_count);
+ av_log(s, AV_LOG_WARNING, "too many blocks: %"PRIu32"\n", b->block_count);
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 1f31968ab99d00a29a8fee9a7ec8eb008e8bbc88..6232c70da243d0aca165779a448b28f9fc15551f 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -134,7 +134,7 @@ static void set_codec_str(AVFormatContext *s, AVCodecParameters *par,
tags[0] = ff_mp4_obj_type;
oti = av_codec_get_tag(tags, par->codec_id);
if (oti)
- av_strlcatf(str, size, ".%02x", oti);
+ av_strlcatf(str, size, ".%02"PRIx32, oti);
else
return;
diff --git a/libavformat/dump.c b/libavformat/dump.c
index 3e6218303d47ebcb698bdcbfe9eedc1a3a060dab..7c811ce5d2bd700c552682f9c5bc50fce5a585ca 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -421,7 +421,8 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent)
dump_audioservicetype(ctx, &sd);
break;
case AV_PKT_DATA_QUALITY_STATS:
- av_log(ctx, AV_LOG_INFO, "quality factor: %d, pict_type: %c", AV_RL32(sd.data), av_get_picture_type_char(sd.data[4]));
+ av_log(ctx, AV_LOG_INFO, "quality factor: %"PRId32", pict_type: %c",
+ AV_RL32(sd.data), av_get_picture_type_char(sd.data[4]));
break;
case AV_PKT_DATA_CPB_PROPERTIES:
av_log(ctx, AV_LOG_INFO, "cpb: ");
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index 91bcdcd99e2599677ba571727f29b96d9ccedc43..a567b5299c83d15a7efec1da829d6264be2ba67f 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -68,7 +68,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
pkt->side_data[i].data,
pkt->side_data[i].size);
}
- av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08x", pkt->side_data[i].size, side_data_crc);
+ av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08"PRIx32, pkt->side_data[i].size, side_data_crc);
}
}
av_strlcatf(buf, sizeof(buf), "\n");
diff --git a/libavformat/ircamdec.c b/libavformat/ircamdec.c
index a6b7a280f3daa015cec5316793e0b6239cb00fdf..d376ffef63fe2d726ceed4aba5ab2917a5cb0165 100644
--- a/libavformat/ircamdec.c
+++ b/libavformat/ircamdec.c
@@ -94,7 +94,7 @@ static int ircam_read_header(AVFormatContext *s)
st->codecpar->codec_id = ff_codec_get_id(tags, tag);
if (st->codecpar->codec_id == AV_CODEC_ID_NONE) {
- av_log(s, AV_LOG_ERROR, "unknown tag %X\n", tag);
+ av_log(s, AV_LOG_ERROR, "unknown tag %"PRIx32"\n", tag);
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 14b85d0d25b34b1eada95211c2f882144d534d7e..127aec1d1d9a18fdcb7210e5b738b0d18d1d6f0b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -412,7 +412,7 @@ retry:
key = c->meta_keys[index];
} else {
av_log(c->fc, AV_LOG_WARNING,
- "The index of 'data' is out of range: %d < 1 or >= %d.\n",
+ "The index of 'data' is out of range: %"PRId32" < 1 or >= %d.\n",
index, c->meta_keys_count);
}
}
@@ -686,7 +686,7 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_skip(pb, len);
}
} else {
- av_log(c->fc, AV_LOG_DEBUG, "Unknown dref type 0x%08x size %d\n",
+ av_log(c->fc, AV_LOG_DEBUG, "Unknown dref type 0x%08"PRIx32" size %"PRIu32"\n",
dref->type, size);
entries--;
i--;
@@ -700,7 +700,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
AVStream *st;
uint32_t type;
- uint32_t av_unused ctype;
+ uint32_t ctype;
int64_t title_size;
char *title_str;
int ret;
@@ -712,8 +712,8 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
ctype = avio_rl32(pb);
type = avio_rl32(pb); /* component subtype */
- av_log(c->fc, AV_LOG_TRACE, "ctype= %.4s (0x%08x)\n", (char*)&ctype, ctype);
- av_log(c->fc, AV_LOG_TRACE, "stype= %.4s\n", (char*)&type);
+ av_log(c->fc, AV_LOG_TRACE, "ctype=%s\n", av_fourcc2str(ctype));
+ av_log(c->fc, AV_LOG_TRACE, "stype=%s\n", av_fourcc2str(type));
if (c->trak_index < 0) { // meta not inside a trak
if (type == MKTAG('m','d','t','a')) {
@@ -2284,8 +2284,8 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
id = mov_codec_id(st, format);
av_log(c->fc, AV_LOG_TRACE,
- "size=%"PRId64" 4CC=%s/0x%08x codec_type=%d\n", size,
- av_fourcc2str(format), format, st->codecpar->codec_type);
+ "size=%"PRId64" 4CC=%s codec_type=%d\n", size,
+ av_fourcc2str(format), st->codecpar->codec_type);
if (st->codecpar->codec_type==AVMEDIA_TYPE_VIDEO) {
st->codecpar->codec_id = id;
@@ -3816,7 +3816,7 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
count = avio_rb32(pb);
if (count > UINT_MAX / sizeof(*c->meta_keys) - 1) {
av_log(c->fc, AV_LOG_ERROR,
- "The 'keys' atom with the invalid key count: %d\n", count);
+ "The 'keys' atom with the invalid key count: %"PRIu32"\n", count);
return AVERROR_INVALIDDATA;
}
@@ -3830,7 +3830,8 @@ static int mov_read_keys(MOVContext *c, AVIOContext *pb, MOVAtom atom)
uint32_t type = avio_rl32(pb);
if (key_size < 8) {
av_log(c->fc, AV_LOG_ERROR,
- "The key# %d in meta has invalid size: %d\n", i, key_size);
+ "The key# %"PRIu32" in meta has invalid size:"
+ "%"PRIu32"\n", i, key_size);
return AVERROR_INVALIDDATA;
}
key_size -= 8;
@@ -5379,8 +5380,8 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom)
total_size += 8;
}
}
- av_log(c->fc, AV_LOG_TRACE, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n",
- a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size);
+ av_log(c->fc, AV_LOG_TRACE, "type:'%s' parent:'%s' sz: %"PRId64" %"PRId64" %"PRId64"\n",
+ av_fourcc2str(a.type), av_fourcc2str(atom.type), a.size, total_size, atom.size);
if (a.size == 0) {
a.size = atom.size - total_size + 8;
}
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index dc8bf8dccc31fa6cf5d4f7ac50421a7e63917213..324dd5f91394df25560b9abfb70f455be0e19f4a 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -557,8 +557,9 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
bitmap = avio_rb32(pb);
num_descr = avio_rb32(pb);
- av_log(s, AV_LOG_TRACE, "chan: layout=%u bitmap=%u num_descr=%u\n",
- layout_tag, bitmap, num_descr);
+ av_log(s, AV_LOG_TRACE, "chan: layout=%"PRIu32" "
+ "bitmap=%"PRIu32" num_descr=%"PRIu32"\n",
+ layout_tag, bitmap, num_descr);
if (size < 12ULL + num_descr * 20ULL)
return 0;
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 298d87290333a63b746aef0236767976b8610e87..a54aa879e903c826d3fcf52bf564e64c148eb921 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1716,7 +1716,7 @@ static int mov_write_gama_tag(AVIOContext *pb, MOVTrack *track, double gamma)
if (gamma > 1e-6) {
gama = (uint32_t)lrint((double)(1<<16) * gamma);
- av_log(pb, AV_LOG_DEBUG, "writing gama value %d\n", gama);
+ av_log(pb, AV_LOG_DEBUG, "writing gama value %"PRId32"\n", gama);
av_assert0(track->mode == MODE_MOV);
avio_wb32(pb, 12);
@@ -2378,8 +2378,8 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
descr = "TimeCodeHandler";
} else {
av_log(s, AV_LOG_WARNING,
- "Unknown hldr_type for %s / 0x%04X, writing dummy values\n",
- av_fourcc2str(track->par->codec_tag), track->par->codec_tag);
+ "Unknown hldr_type for %s, writing dummy values\n",
+ av_fourcc2str(track->par->codec_tag));
}
if (track->st) {
// hdlr.name is used by some players to identify the content title
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 034862261a00ad169045c497024be0e80a78a211..3cbf7bd13702e6b1176225524cedce707c78cca0 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -319,7 +319,7 @@ static int mp3_write_audio_packet(AVFormatContext *s, AVPacket *pkt)
if ((mpah.bit_rate == 0) || (mp3->initial_bitrate != mpah.bit_rate))
mp3->has_variable_bitrate = 1;
} else {
- av_log(s, AV_LOG_WARNING, "Audio packet of size %d (starting with %08X...) "
+ av_log(s, AV_LOG_WARNING, "Audio packet of size %d (starting with %08"PRIX32"...) "
"is invalid, writing it anyway.\n", pkt->size, h);
}
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 3250dde311edffade7214c66d6c61188ada99bff..acea2e93a641c86d87303e046395e42963ef3f7c 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1433,7 +1433,8 @@ int ff_check_h264_startcode(AVFormatContext *s, const AVStream *st, const AVPack
return AVERROR_INVALIDDATA;
}
av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing, size %d", pkt->size);
- if (pkt->size) av_log(s, AV_LOG_WARNING, " data %08X", AV_RB32(pkt->data));
+ if (pkt->size)
+ av_log(s, AV_LOG_WARNING, " data %08"PRIX32, AV_RB32(pkt->data));
av_log(s, AV_LOG_WARNING, "\n");
}
return 0;
@@ -1447,7 +1448,8 @@ static int check_hevc_startcode(AVFormatContext *s, const AVStream *st, const AV
return AVERROR_PATCHWELCOME;
}
av_log(s, AV_LOG_WARNING, "HEVC bitstream error, startcode missing, size %d", pkt->size);
- if (pkt->size) av_log(s, AV_LOG_WARNING, " data %08X", AV_RB32(pkt->data));
+ if (pkt->size)
+ av_log(s, AV_LOG_WARNING, " data %08"PRIX32, AV_RB32(pkt->data));
av_log(s, AV_LOG_WARNING, "\n");
}
return 0;
@@ -1565,7 +1567,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
do {
p = avpriv_find_start_code(p, buf_end, &state);
- av_log(s, AV_LOG_TRACE, "nal %d\n", state & 0x1f);
+ av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", state & 0x1f);
if ((state & 0x1f) == 7)
extradd = 0;
} while (p < buf_end && (state & 0x1f) != 9 &&
@@ -1631,7 +1633,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
do {
p = avpriv_find_start_code(p, buf_end, &state);
- av_log(s, AV_LOG_TRACE, "nal %d\n", (state & 0x7e)>>1);
+ av_log(s, AV_LOG_TRACE, "nal %"PRId32"\n", (state & 0x7e)>>1);
if ((state & 0x7e) == 2*32)
extradd = 0;
} while (p < buf_end && (state & 0x7e) != 2*35 &&
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 424b3346c947763dfda8325b0d73d3bed221bd90..e684385b4d68d3466279e380e0c49c6590719846 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -372,9 +372,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (!validate_codec_tag(s, st)) {
const uint32_t otag = av_codec_get_tag(s->oformat->codec_tag, par->codec_id);
av_log(s, AV_LOG_ERROR,
- "Tag %s/0x%08x incompatible with output codec id '%d' (%s)\n",
- av_fourcc2str(par->codec_tag), par->codec_tag,
- par->codec_id, av_fourcc2str(otag));
+ "Tag %s incompatible with output codec id '%d' (%s)\n",
+ av_fourcc2str(par->codec_tag), par->codec_id, av_fourcc2str(otag));
ret = AVERROR_INVALIDDATA;
goto fail;
}
diff --git a/libavformat/nistspheredec.c b/libavformat/nistspheredec.c
index 782d1dfbfbb94ae46124cb6c0566ff74e036dd99..55f22ebcf4f0ea052167e6ccd6c0e16ea0bb5b00 100644
--- a/libavformat/nistspheredec.c
+++ b/libavformat/nistspheredec.c
@@ -89,7 +89,7 @@ static int nist_read_header(AVFormatContext *s)
return 0;
} else if (!memcmp(buffer, "channel_count", 13)) {
- sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->channels);
+ sscanf(buffer, "%*s %*s %u", &st->codecpar->channels);
} else if (!memcmp(buffer, "sample_byte_format", 18)) {
sscanf(buffer, "%*s %*s %31s", format);
@@ -108,11 +108,11 @@ static int nist_read_header(AVFormatContext *s)
} else if (!memcmp(buffer, "sample_count", 12)) {
sscanf(buffer, "%*s %*s %"SCNd64, &st->duration);
} else if (!memcmp(buffer, "sample_n_bytes", 14)) {
- sscanf(buffer, "%*s %*s %"SCNd32, &bps);
+ sscanf(buffer, "%*s %*s %d", &bps);
} else if (!memcmp(buffer, "sample_rate", 11)) {
- sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->sample_rate);
+ sscanf(buffer, "%*s %*s %d", &st->codecpar->sample_rate);
} else if (!memcmp(buffer, "sample_sig_bits", 15)) {
- sscanf(buffer, "%*s %*s %"SCNd32, &st->codecpar->bits_per_coded_sample);
+ sscanf(buffer, "%*s %*s %d", &st->codecpar->bits_per_coded_sample);
} else {
char key[32], value[32];
if (sscanf(buffer, "%31s %*s %31s", key, value) == 2) {
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index ae179991cefe26ede7b9e63c768d12e5b5757900..c6ddb67bbddcb7797844f3c5f5dfb08105396804 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -228,7 +228,7 @@ static int nsv_resync(AVFormatContext *s)
v <<= 8;
v |= avio_r8(pb);
if (i < 8) {
- av_log(s, AV_LOG_TRACE, "NSV resync: [%d] = %02x\n", i, v & 0x0FF);
+ av_log(s, AV_LOG_TRACE, "NSV resync: [%d] = %02"PRIx32"\n", i, v & 0x0FF);
}
if ((v & 0x0000ffff) == 0xefbe) { /* BEEF */
@@ -543,7 +543,7 @@ null_chunk_retry:
asize = avio_rl16(pb);
vsize = (vsize << 4) | (auxcount >> 4);
auxcount &= 0x0f;
- av_log(s, AV_LOG_TRACE, "NSV CHUNK %d aux, %u bytes video, %d bytes audio\n", auxcount, vsize, asize);
+ av_log(s, AV_LOG_TRACE, "NSV CHUNK %d aux, %"PRIu32" bytes video, %d bytes audio\n", auxcount, vsize, asize);
/* skip aux stuff */
for (i = 0; i < auxcount; i++) {
uint32_t av_unused auxtag;
diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c
index d89cc37ee0a76b51ef5ab31f88256ddb8099ac05..7952808bf862b2ce630ccec344ac9effa6d5a3d1 100644
--- a/libavformat/omaenc.c
+++ b/libavformat/omaenc.c
@@ -84,8 +84,8 @@ static av_cold int oma_write_header(AVFormatContext *s)
(par->block_align/8 - 1));
break;
default:
- av_log(s, AV_LOG_ERROR, "unsupported codec tag %d for write\n",
- par->codec_tag);
+ av_log(s, AV_LOG_ERROR, "unsupported codec tag %s for write\n",
+ av_fourcc2str(par->codec_tag));
return AVERROR(EINVAL);
}
for (i = 0; i < (EA3_HEADER_SIZE - 36)/4; i++)
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 88c2b9abf91487ac48b2335f49111fe8e502a47b..178eaea57d89dd04d8c04d59101d047ac0daa4b6 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -380,7 +380,8 @@ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
st->codecpar->codec_tag = avio_rl32(pb);
st->codecpar->codec_id = ff_codec_get_id(ff_rm_codec_tags,
st->codecpar->codec_tag);
- av_log(s, AV_LOG_TRACE, "%X %X\n", st->codecpar->codec_tag, MKTAG('R', 'V', '2', '0'));
+ av_log(s, AV_LOG_TRACE, "%"PRIX32" %X\n",
+ st->codecpar->codec_tag, MKTAG('R', 'V', '2', '0'));
if (st->codecpar->codec_id == AV_CODEC_ID_NONE)
goto fail1;
st->codecpar->width = avio_rb16(pb);
diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index a794d3b48535dd9105cb697cfe3f17372a58a584..d37360047860073b44d18d921eb400187222e1a2 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -170,8 +170,8 @@ static int rpl_read_header(AVFormatContext *s)
vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE130;
break;
default:
- avpriv_report_missing_feature(s, "Video format %i",
- vst->codecpar->codec_tag);
+ avpriv_report_missing_feature(s, "Video format %s",
+ av_fourcc2str(vst->codecpar->codec_tag));
vst->codecpar->codec_id = AV_CODEC_ID_NONE;
}
@@ -233,8 +233,8 @@ static int rpl_read_header(AVFormatContext *s)
rpl->frames_per_chunk = read_line_and_int(pb, &error); // video frames per chunk
if (rpl->frames_per_chunk > 1 && vst->codecpar->codec_tag != 124)
av_log(s, AV_LOG_WARNING,
- "Don't know how to split frames for video format %i. "
- "Video stream will be broken!\n", vst->codecpar->codec_tag);
+ "Don't know how to split frames for video format %s. "
+ "Video stream will be broken!\n", av_fourcc2str(vst->codecpar->codec_tag));
number_of_chunks = read_line_and_int(pb, &error); // number of chunks in the file
// The number in the header is actually the index of the last chunk.
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index eee17d07a6bbb16687e05f73dde0b5ad687eaf3e..af631a883aa87bc2656420d1c828c04b0d0b9433 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -285,7 +285,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time, int bye)
RTPMuxContext *s = s1->priv_data;
uint32_t rtp_ts;
- av_log(s1, AV_LOG_TRACE, "RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
+ av_log(s1, AV_LOG_TRACE, "RTCP: %02x %"PRIx64" %"PRIx32"\n", s->payload_type, ntp_time, s->timestamp);
s->last_rtcp_ntp_time = ntp_time;
rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, (AVRational){1, 1000000},
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 067db63f215605638f7c7adad0c2f73fa8c9f155..56bd0c43f69020502b88e859a9d47b86c9791cd8 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -78,7 +78,7 @@ static int get_event_info(const char *line, struct event_info *ei)
ei->pts = AV_NOPTS_VALUE;
ei->pos = -1;
if (sscanf(line, "%d:%d:%d%*1[,.]%d --> %d:%d:%d%*1[,.]%d"
- "%*[ ]X1:%u X2:%u Y1:%u Y2:%u",
+ "%*[ ]X1:%"PRId32" X2:%"PRId32" Y1:%"PRId32" Y2:%"PRId32,
&hh1, &mm1, &ss1, &ms1,
&hh2, &mm2, &ss2, &ms2,
&ei->x1, &ei->x2, &ei->y1, &ei->y2) >= 8) {
diff --git a/libavformat/uncodedframecrcenc.c b/libavformat/uncodedframecrcenc.c
index 5e1a445f4fa130b114e656cd156db6efb281acc5..ecc42d28695fb2aaf4759338618edadb2d366dd6 100644
--- a/libavformat/uncodedframecrcenc.c
+++ b/libavformat/uncodedframecrcenc.c
@@ -115,7 +115,7 @@ static void audio_frame_cksum(AVBPrint *bp, AVFrame *frame)
default:
av_assert0(!"reached");
}
- av_bprintf(bp, ", 0x%08x", cksum);
+ av_bprintf(bp, ", 0x%08"PRIx32, cksum);
}
}
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 5a54f130a0a6d46c2a9b730eaa9894df5f878a70..efb9847ff09129aca4dd48750470530ca527c6fe 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -250,7 +250,8 @@ static int wsvqa_read_packet(AVFormatContext *s,
case CMDS_TAG:
break;
default:
- av_log(s, AV_LOG_INFO, "Skipping unknown chunk 0x%08X\n", chunk_type);
+ av_log(s, AV_LOG_INFO, "Skipping unknown chunk %s\n",
+ av_fourcc2str(av_bswap32(chunk_type)));
}
avio_skip(pb, chunk_size + skip_byte);
}
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 9235157a773a1fc0eb7cb6d0ece9421025e134d5..1c187729289b8c3a2d2c9769516529bf04593cdd 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -87,8 +87,9 @@ static int xwma_read_header(AVFormatContext *s)
*/
if (st->codecpar->codec_id != AV_CODEC_ID_WMAV2 &&
st->codecpar->codec_id != AV_CODEC_ID_WMAPRO) {
- avpriv_request_sample(s, "Unexpected codec (tag 0x%04x; id %d)",
- st->codecpar->codec_tag, st->codecpar->codec_id);
+ avpriv_request_sample(s, "Unexpected codec (tag %s; id %d)",
+ av_fourcc2str(st->codecpar->codec_tag),
+ st->codecpar->codec_id);
} else {
/* In all xWMA files I have seen, there is no extradata. But the WMA
* codecs require extradata, so we provide our own fake extradata.
diff --git a/libavutil/log.c b/libavutil/log.c
index 44c11cb0917e856b19a6634e775683b243e2e8a6..be806202ffbb8c7e0b91903a25e7ef5a5cfd56f4 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -168,19 +168,19 @@ static void colored_fputs(int level, int tint, const char *str)
#else
if (local_use_color == 1) {
fprintf(stderr,
- "\033[%d;3%dm%s\033[0m",
+ "\033[%"PRIu32";3%"PRIu32"m%s\033[0m",
(color[level] >> 4) & 15,
color[level] & 15,
str);
} else if (tint && use_color == 256) {
fprintf(stderr,
- "\033[48;5;%dm\033[38;5;%dm%s\033[0m",
+ "\033[48;5;%"PRIu32"m\033[38;5;%dm%s\033[0m",
(color[level] >> 16) & 0xff,
tint,
str);
} else if (local_use_color == 256) {
fprintf(stderr,
- "\033[48;5;%dm\033[38;5;%dm%s\033[0m",
+ "\033[48;5;%"PRIu32"m\033[38;5;%"PRIu32"m%s\033[0m",
(color[level] >> 16) & 0xff,
(color[level] >> 8) & 0xff,
str);
diff --git a/libavutil/timecode.c b/libavutil/timecode.c
index fa92df1ef98d556c3544bb906bdba1f449af6c4b..c0c67c847868908636ae7d549d903e76f7ff5912 100644
--- a/libavutil/timecode.c
+++ b/libavutil/timecode.c
@@ -129,7 +129,8 @@ char *av_timecode_make_smpte_tc_string(char *buf, uint32_t tcsmpte, int prevent_
char *av_timecode_make_mpeg_tc_string(char *buf, uint32_t tc25bit)
{
- snprintf(buf, AV_TIMECODE_STR_SIZE, "%02u:%02u:%02u%c%02u",
+ snprintf(buf, AV_TIMECODE_STR_SIZE,
+ "%02"PRIu32":%02"PRIu32":%02"PRIu32"%c%02"PRIu32,
tc25bit>>19 & 0x1f, // 5-bit hours
tc25bit>>13 & 0x3f, // 6-bit minutes
tc25bit>>6 & 0x3f, // 6-bit seconds