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/hnm.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/hnm.c')
| -rw-r--r-- | libavformat/hnm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/hnm.c b/libavformat/hnm.c index 47a1808afb..8c381021c5 100644 --- a/libavformat/hnm.c +++ b/libavformat/hnm.c @@ -20,6 +20,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" @@ -149,8 +151,9 @@ static int hnm_read_packet(AVFormatContext *s, AVPacket *pkt) avio_skip(pb, 2); if (chunk_size > hnm->superchunk_remaining || !chunk_size) { - av_log(s, AV_LOG_ERROR, "invalid chunk size: %u, offset: %u\n", - chunk_size, (int) avio_tell(pb)); + av_log(s, AV_LOG_ERROR, + "invalid chunk size: %"PRIu32", offset: %"PRId64"\n", + chunk_size, avio_tell(pb)); avio_skip(pb, hnm->superchunk_remaining - 8); hnm->superchunk_remaining = 0; } @@ -172,8 +175,8 @@ static int hnm_read_packet(AVFormatContext *s, AVPacket *pkt) break; default: - av_log(s, AV_LOG_WARNING, "unknown chunk found: %d, offset: %d\n", - chunk_id, (int) avio_tell(pb)); + av_log(s, AV_LOG_WARNING, "unknown chunk found: %"PRIu16", offset: %"PRId64"\n", + chunk_id, avio_tell(pb)); avio_skip(pb, chunk_size - 8); hnm->superchunk_remaining -= chunk_size; break; |