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/dfa.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/dfa.c')
| -rw-r--r-- | libavformat/dfa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/dfa.c b/libavformat/dfa.c index 9cd13e24d9..dfa0590e2e 100644 --- a/libavformat/dfa.c +++ b/libavformat/dfa.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> + #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" @@ -98,12 +100,13 @@ static int dfa_read_packet(AVFormatContext *s, AVPacket *pkt) first = 0; frame_size = AV_RL32(pkt->data + pkt->size - 8); if (frame_size > INT_MAX - 4) { - av_log(s, AV_LOG_ERROR, "Too large chunk size: %d\n", frame_size); + av_log(s, AV_LOG_ERROR, "Too large chunk size: %"PRIu32"\n", frame_size); return AVERROR(EIO); } if (AV_RL32(pkt->data + pkt->size - 12) == MKTAG('E', 'O', 'F', 'R')) { if (frame_size) { - av_log(s, AV_LOG_WARNING, "skipping %d bytes of end-of-frame marker chunk\n", + av_log(s, AV_LOG_WARNING, + "skipping %"PRIu32" bytes of end-of-frame marker chunk\n", frame_size); avio_skip(pb, frame_size); } |