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/utvideodec.c | |
| parent | 119cf2a44b124ac5ed749589a78233272f4101a1 (diff) | |
| parent | cba4e6062a02d5bf684e13a770be88aa1fec717e (diff) | |
| download | ffmpeg-streaming-45ba9d8545829e9c3df1b57de0b00256d8eddaac.zip ffmpeg-streaming-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/utvideodec.c')
| -rw-r--r-- | libavcodec/utvideodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index b5a3907..2bd177d 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -483,7 +483,7 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d.%d.%d\n", avctx->extradata[3], avctx->extradata[2], avctx->extradata[1], avctx->extradata[0]); - av_log(avctx, AV_LOG_DEBUG, "Original format %X\n", + av_log(avctx, AV_LOG_DEBUG, "Original format %"PRIX32"\n", AV_RB32(avctx->extradata + 4)); c->frame_info_size = AV_RL32(avctx->extradata + 8); c->flags = AV_RL32(avctx->extradata + 12); |
