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/framecrcenc.c | |
| parent | 5171ae781a240cac3860c20f9aefc6d1b2c61cac (diff) | |
| parent | d92024f18fa3d69937cb2575f3a8bf973df02430 (diff) | |
| download | ffmpeg-streaming-28ee7757f5b0859510e3af6bf49fca9881f09966.zip ffmpeg-streaming-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/framecrcenc.c')
| -rw-r--r-- | libavformat/framecrcenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index dbe49b5..4a96083 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <inttypes.h> + #include "libavutil/adler32.h" #include "libavutil/avstring.h" #include "avformat.h" @@ -29,7 +31,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) uint32_t crc = av_adler32_update(0, pkt->data, pkt->size); char buf[256]; - snprintf(buf, sizeof(buf), "%d, %10"PRId64", %10"PRId64", %8d, %8d, 0x%08x", + snprintf(buf, sizeof(buf), "%d, %10"PRId64", %10"PRId64", %8d, %8d, 0x%08"PRIx32, pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size, crc); if (pkt->flags != AV_PKT_FLAG_KEY) av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags); |
