diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-03-13 12:13:33 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-03-22 14:08:20 +0100 |
commit | cc8163e1a3601a56f722a4720516e860bf1c6198 (patch) | |
tree | d024d6a6300f2c013910239746ede9a97971518a /libavcodec/jpeg2000dec.c | |
parent | 7513234bdd93f80593bfee3eb2da8c8f0d3992da (diff) | |
download | ffmpeg-cc8163e1a3601a56f722a4720516e860bf1c6198.tar.gz |
avcodec: more correct printf specifiers
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
-rw-r--r-- | libavcodec/jpeg2000dec.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index cc154c3522..f6fa2a5ec1 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -25,6 +25,8 @@ * JPEG 2000 image decoder */ +#include <inttypes.h> + #include "libavutil/common.h" #include "libavutil/opt.h" #include "avcodec.h" @@ -345,7 +347,7 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, if (tmp.mct && s->ncomponents < 3) { av_log(s->avctx, AV_LOG_ERROR, - "MCT %d with too few components (%d)\n", + "MCT %"PRIu8" with too few components (%d)\n", tmp.mct, s->ncomponents); return AVERROR_INVALIDDATA; } @@ -497,12 +499,12 @@ static int get_sot(Jpeg2000DecoderContext *s, int n) bytestream2_get_byteu(&s->g); // TNsot if (Psot > bytestream2_get_bytes_left(&s->g) + n + 2) { - av_log(s->avctx, AV_LOG_ERROR, "Psot %d too big\n", Psot); + av_log(s->avctx, AV_LOG_ERROR, "Psot %"PRIu32" too big\n", Psot); return AVERROR_INVALIDDATA; } if (TPsot >= FF_ARRAY_ELEMS(s->tile[Isot].tile_part)) { - avpriv_request_sample(s->avctx, "Support for %d components", TPsot); + avpriv_request_sample(s->avctx, "Support for %"PRIu8" components", TPsot); return AVERROR_PATCHWELCOME; } @@ -718,7 +720,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, if (cblk->length > sizeof(cblk->data)) { av_log(s->avctx, AV_LOG_ERROR, - "Block length %d > data size %zd\n", + "Block length %"PRIu16" > data size %zd\n", cblk->length, sizeof(cblk->data)); return AVERROR_INVALIDDATA; } @@ -1343,14 +1345,15 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) break; default: av_log(s->avctx, AV_LOG_ERROR, - "unsupported marker 0x%.4X at pos 0x%X\n", + "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", marker, bytestream2_tell(&s->g) - 4); bytestream2_skip(&s->g, len - 2); break; } if (bytestream2_tell(&s->g) - oldpos != len || ret) { av_log(s->avctx, AV_LOG_ERROR, - "error during processing marker segment %.4x\n", marker); + "error during processing marker segment %.4"PRIx16"\n", + marker); return ret ? ret : -1; } } |