diff options
author | Diego Biurrun <diego@biurrun.de> | 2016-12-21 11:25:34 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-12-23 19:30:00 +0100 |
commit | 0b77a5933635293508e7289e7cf191ed166cf070 (patch) | |
tree | 2dd54951ec6e63b1f9e7dadecb0c737c97e8fc36 /libavcodec | |
parent | 92db5083077a8b0f8e1050507671b456fd155125 (diff) | |
download | ffmpeg-0b77a5933635293508e7289e7cf191ed166cf070.tar.gz |
Use correct printf conversion specifiers for POSIX integer types
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dxv.c | 2 | ||||
-rw-r--r-- | libavcodec/hqx.c | 2 | ||||
-rw-r--r-- | libavcodec/mpegaudiodec_template.c | 2 | ||||
-rw-r--r-- | libavcodec/parser.c | 4 | ||||
-rw-r--r-- | libavcodec/pngdec.c | 2 | ||||
-rw-r--r-- | libavcodec/vorbisdec.c | 6 | ||||
-rw-r--r-- | libavcodec/wmaprodec.c | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 9b14ef46ae..41cac73e5e 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -366,7 +366,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. */ diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c index 3c359e3863..2d1abf0cca 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/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 4b90c6fb81..e9ea65eed1 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -274,7 +274,7 @@ 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, 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 355187ae45..3ef1249341 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -228,7 +228,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]); @@ -285,7 +285,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/pngdec.c b/libavcodec/pngdec.c index a6ab665624..d59409764d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -453,7 +453,7 @@ static int decode_frame(AVCodecContext *avctx, if (length > 0x7fffffff) goto fail; tag = bytestream2_get_le32(&s->gb); - ff_dlog(avctx, "png: tag=%c%c%c%c length=%u\n", + ff_dlog(avctx, "png: tag=%c%c%c%c length=%"PRIu32"\n", (tag & 0xff), ((tag >> 8) & 0xff), ((tag >> 16) & 0xff), diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 8b800fd439..9289c82cf4 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -715,7 +715,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 %u classif.s %"PRIu8" classbook %"PRIu8"\n", res_setup->begin, res_setup->end, res_setup->partition_size, res_setup->classifications, res_setup->classbook); @@ -855,7 +855,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; @@ -988,7 +988,7 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) ff_mdct_init(&vc->mdct[0], bl0, 1, -1.0); ff_mdct_init(&vc->mdct[1], bl1, 1, -1.0); - 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 daeaa79a7b..08b41f446f 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -607,8 +607,8 @@ 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]" - " len %i\n", s->frame_num, c, i, + ff_dlog(s->avctx, "frame[%"PRIi32"] channel[%i] subframe[%i]" + " len %"PRIu16"\n", s->frame_num, c, i, s->channel[c].subframe_len[i]); s->channel[c].subframe_offset[i] = offset; offset += s->channel[c].subframe_len[i]; |