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 /libavformat | |
parent | 92db5083077a8b0f8e1050507671b456fd155125 (diff) |
Use correct printf conversion specifiers for POSIX integer types
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/mov.c | 2 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/mux.c | 2 | ||||
-rw-r--r-- | libavformat/omaenc.c | 2 | ||||
-rw-r--r-- | libavformat/rmdec.c | 2 | ||||
-rw-r--r-- | libavformat/rpl.c | 4 | ||||
-rw-r--r-- | libavformat/xwma.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index ed10a15625..8b38fa43b8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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')) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f99617a96e..3dd882c263 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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) { diff --git a/libavformat/mux.c b/libavformat/mux.c index 2561a6d6f9..a85c3c79db 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -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; diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c index 50f369d967..793d0fd345 100644 --- a/libavformat/omaenc.c +++ b/libavformat/omaenc.c @@ -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++) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 51a5bf767c..2e93f1d4e8 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -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); diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 0fa940e524..6f6119c685 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -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 diff --git a/libavformat/xwma.c b/libavformat/xwma.c index e6e72d9b52..006f60d33e 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -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 |