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/h264_ps.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/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index be8a874d98..9707332892 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -548,7 +548,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) if (h->avctx->debug & FF_DEBUG_PICT_INFO) { static const char csp[4][5] = { "Gray", "420", "422", "444" }; av_log(h->avctx, AV_LOG_DEBUG, - "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%u/%u/%u/%u %s %s %d/%d b%d reo:%d\n", + "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%u/%u/%u/%u %s %s %"PRId32"/%"PRId32" b%d reo:%d\n", sps_id, sps->profile_idc, sps->level_idc, sps->poc_type, sps->ref_frame_count, |