diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:05:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:05:34 +0100 |
commit | 28ee7757f5b0859510e3af6bf49fca9881f09966 (patch) | |
tree | 6b6e7ab386a73b664aac3ce21c4ee0d3dff38d4a /libavformat/omadec.c | |
parent | 5171ae781a240cac3860c20f9aefc6d1b2c61cac (diff) | |
parent | d92024f18fa3d69937cb2575f3a8bf973df02430 (diff) |
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
lavf: more correct printf format specifiers
Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/omadec.c')
-rw-r--r-- | libavformat/omadec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index dc6a12af3c..9f0d52087c 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -40,6 +40,8 @@ * Supported decoders: ATRAC3, ATRAC3+, MP3, LPCM */ +#include <inttypes.h> + #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" @@ -215,7 +217,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) if (geob->datasize < 64) { av_log(s, AV_LOG_ERROR, - "Invalid GEOB data size: %u\n", geob->datasize); + "Invalid GEOB data size: %"PRIu32"\n", geob->datasize); return AVERROR_INVALIDDATA; } @@ -239,7 +241,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) return AVERROR_INVALIDDATA; } oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]); - av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid); + av_log(s, AV_LOG_DEBUG, "RID: %.8"PRIx32"\n", oc->rid); memcpy(oc->iv, &header[0x58], 8); hex_log(s, AV_LOG_DEBUG, "IV", oc->iv, 8); @@ -366,7 +368,7 @@ static int oma_read_header(AVFormatContext *s) channel_id = (codec_params >> 10) & 7; if (!channel_id) { av_log(s, AV_LOG_ERROR, - "Invalid ATRAC-X channel id: %d\n", channel_id); + "Invalid ATRAC-X channel id: %"PRIu32"\n", channel_id); return AVERROR_INVALIDDATA; } st->codec->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1]; |