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/smjpegdec.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/smjpegdec.c')
| -rw-r--r-- | libavformat/smjpegdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/smjpegdec.c b/libavformat/smjpegdec.c index 38ac2fb086..e4c7a9b890 100644 --- a/libavformat/smjpegdec.c +++ b/libavformat/smjpegdec.c @@ -24,6 +24,8 @@ * This is a demuxer for Loki SDL Motion JPEG files */ +#include <inttypes.h> + #include "avformat.h" #include "internal.h" #include "riff.h" @@ -52,7 +54,7 @@ static int smjpeg_read_header(AVFormatContext *s) avio_skip(pb, 8); // magic version = avio_rb32(pb); if (version) - avpriv_request_sample(s, "Unknown version %d", version); + avpriv_request_sample(s, "Unknown version %"PRIu32, version); duration = avio_rb32(pb); // in msec @@ -124,7 +126,7 @@ static int smjpeg_read_header(AVFormatContext *s) case SMJPEG_HEND: return 0; default: - av_log(s, AV_LOG_ERROR, "unknown header %x\n", htype); + av_log(s, AV_LOG_ERROR, "unknown header %"PRIx32"\n", htype); return AVERROR_INVALIDDATA; } } @@ -164,7 +166,7 @@ static int smjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) ret = AVERROR_EOF; break; default: - av_log(s, AV_LOG_ERROR, "unknown chunk %x\n", dtype); + av_log(s, AV_LOG_ERROR, "unknown chunk %"PRIx32"\n", dtype); ret = AVERROR_INVALIDDATA; break; } |