diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
| commit | 45ba9d8545829e9c3df1b57de0b00256d8eddaac (patch) | |
| tree | f0c37254e7988fae6ddf702f99da0cf7dac9a2bf /libavcodec/xwddec.c | |
| parent | 119cf2a44b124ac5ed749589a78233272f4101a1 (diff) | |
| parent | cba4e6062a02d5bf684e13a770be88aa1fec717e (diff) | |
| download | ffmpeg-45ba9d8545829e9c3df1b57de0b00256d8eddaac.tar.gz | |
Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
More correct printf format specifiers
Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xwddec.c')
| -rw-r--r-- | libavcodec/xwddec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c index 54990c0248..62dfdace16 100644 --- a/libavcodec/xwddec.c +++ b/libavcodec/xwddec.c @@ -83,7 +83,9 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_DEBUG, "vclass %"PRIu32", ncolors %"PRIu32", bpp %"PRIu32", be %"PRIu32", lsize %"PRIu32", xoffset %"PRIu32"\n", vclass, ncolors, bpp, be, lsize, xoffset); - av_log(avctx, AV_LOG_DEBUG, "red %0x, green %0x, blue %0x\n", rgb[0], rgb[1], rgb[2]); + av_log(avctx, AV_LOG_DEBUG, + "red %0"PRIx32", green %0"PRIx32", blue %0"PRIx32"\n", + rgb[0], rgb[1], rgb[2]); if (pixformat > XWD_Z_PIXMAP) { av_log(avctx, AV_LOG_ERROR, "invalid pixmap format\n"); |