Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use correct printf conversion specifiers for POSIX integer types

Browse Source
pull/202/merge
Diego Biurrun 8 years ago
parent 92db508307
commit 0b77a59336
14 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/dxv.c
  2. 2
      libavcodec/hqx.c
  3. 2
      libavcodec/mpegaudiodec_template.c
  4. 4
      libavcodec/parser.c
  5. 2
      libavcodec/pngdec.c
  6. 6
      libavcodec/vorbisdec.c
  7. 4
      libavcodec/wmaprodec.c
  8. 2
      libavformat/mov.c
  9. 2
      libavformat/movenc.c
  10. 2
      libavformat/mux.c
  11. 2
      libavformat/omaenc.c
  12. 2
      libavformat/rmdec.c
  13. 4
      libavformat/rpl.c
  14. 2
      libavformat/xwma.c

2
libavcodec/dxv.c
Unescape View File

@ -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. */

2
libavcodec/hqx.c
Unescape View File

@ -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",

2
libavcodec/mpegaudiodec_template.c
Unescape View File

@ -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]);

4
libavcodec/parser.c
Unescape View File

@ -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]);

2
libavcodec/pngdec.c
Unescape View File

@ -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),

6
libavcodec/vorbisdec.c
Unescape View File

@ -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]);
/*

4
libavcodec/wmaprodec.c
Unescape View File

@ -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];

2
libavformat/mov.c
Unescape View File

@ -634,7 +634,7 @@ 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, "ctype= %.4s (0x%08"PRIx32")\n", (char *)&ctype, ctype);
av_log(c->fc, AV_LOG_TRACE, "stype= %.4s\n", (char*)&type);
if (type == MKTAG('v','i','d','e'))

2
libavformat/movenc.c
Unescape View File

@ -1377,7 +1377,7 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
track->par->codec_tag);
av_log(s, AV_LOG_WARNING,
"Unknown hldr_type for %s / 0x%04X, writing dummy values\n",
"Unknown hldr_type for %s / 0x%04"PRIX32", writing dummy values\n",
tag_buf, track->par->codec_tag);
}
if (track->st) {

2
libavformat/mux.c
Unescape View File

@ -205,7 +205,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
char tagbuf[32];
av_get_codec_tag_string(tagbuf, sizeof(tagbuf), par->codec_tag);
av_log(s, AV_LOG_ERROR,
"Tag %s/0x%08x incompatible with output codec id '%d'\n",
"Tag %s/0x%08"PRIx32" incompatible with output codec id '%d'\n",
tagbuf, par->codec_tag, par->codec_id);
ret = AVERROR_INVALIDDATA;
goto fail;

2
libavformat/omaenc.c
Unescape View File

@ -84,7 +84,7 @@ static av_cold int oma_write_header(AVFormatContext *s)
(par->block_align/8 - 1));
break;
default:
av_log(s, AV_LOG_ERROR, "OMA: unsupported codec tag %d for write\n",
av_log(s, AV_LOG_ERROR, "OMA: unsupported codec tag %"PRIu32" for write\n",
par->codec_tag);
}
for (i = 0; i < (EA3_HEADER_SIZE - 36)/4; i++)

2
libavformat/rmdec.c
Unescape View File

@ -319,7 +319,7 @@ 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);

4
libavformat/rpl.c
Unescape View File

@ -171,7 +171,7 @@ static int rpl_read_header(AVFormatContext *s)
break;
default:
av_log(s, AV_LOG_WARNING,
"RPL video format %i not supported yet!\n",
"RPL video format %"PRIu32" not supported yet!\n",
vst->codecpar->codec_tag);
vst->codecpar->codec_id = AV_CODEC_ID_NONE;
}
@ -236,7 +236,7 @@ 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. "
"Don't know how to split frames for video format %"PRIu32". "
"Video stream will be broken!\n", vst->codecpar->codec_tag);
number_of_chunks = read_line_and_int(pb, &error); // number of chunks in the file

2
libavformat/xwma.c
Unescape View File

@ -86,7 +86,7 @@ static int xwma_read_header(AVFormatContext *s)
* anyway.
*/
if (st->codecpar->codec_id != AV_CODEC_ID_WMAV2) {
avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)",
avpriv_request_sample(s, "Unexpected codec (tag 0x04%"PRIx32"; id %d)",
st->codecpar->codec_tag, st->codecpar->codec_id);
} else {
/* In all xWMA files I have seen, there is no extradata. But the WMA

Write Preview
Loading…
Cancel
Save