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/g2meet.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/g2meet.c')
| -rw-r--r-- | libavcodec/g2meet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index d6b12727fb..700eb338c4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -779,7 +779,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, break; } if (chunk_size < 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid tile data size %d\n", + av_log(avctx, AV_LOG_ERROR, "Invalid tile data size %"PRIu32"\n", chunk_size); break; } @@ -830,7 +830,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, case CHUNK_CD: break; default: - av_log(avctx, AV_LOG_WARNING, "Skipping chunk type %02"PRIX32"\n", + av_log(avctx, AV_LOG_WARNING, "Skipping chunk type %02d\n", chunk_type); } |