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/electronicarts.c | |
| parent | 5171ae781a240cac3860c20f9aefc6d1b2c61cac (diff) | |
| parent | d92024f18fa3d69937cb2575f3a8bf973df02430 (diff) | |
| download | ffmpeg-28ee7757f5b0859510e3af6bf49fca9881f09966.tar.gz | |
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/electronicarts.c')
| -rw-r--r-- | libavformat/electronicarts.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 4ba0fa0b61..1acaa14c8c 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -25,6 +25,8 @@ * by Robin Kay (komadori at gekkou.co.uk) */ +#include <inttypes.h> + #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" @@ -152,7 +154,7 @@ static int process_audio_header_elements(AVFormatContext *s) break; case 0x8A: av_log(s, AV_LOG_DEBUG, - "element 0x%02x set to 0x%08x\n", + "element 0x%02x set to 0x%08"PRIx32"\n", subbyte, read_arbitrary(pb)); av_log(s, AV_LOG_DEBUG, "exited audio subheader\n"); in_subheader = 0; @@ -171,7 +173,7 @@ static int process_audio_header_elements(AVFormatContext *s) break; default: av_log(s, AV_LOG_DEBUG, - "element 0x%02x set to 0x%08x\n", + "element 0x%02x set to 0x%08"PRIx32"\n", subbyte, read_arbitrary(pb)); break; } @@ -183,7 +185,7 @@ static int process_audio_header_elements(AVFormatContext *s) break; default: av_log(s, AV_LOG_DEBUG, - "header element 0x%02x set to 0x%08x\n", + "header element 0x%02x set to 0x%08"PRIx32"\n", byte, read_arbitrary(pb)); break; } |