diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:21:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:21:10 +0100 |
| commit | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (patch) | |
| tree | 307a6348456706e6ca2d3aebfc89b999192f556b | |
| parent | 54df8b4feaf43c0c65e3e8bf541897e0abba3549 (diff) | |
| parent | 7513234bdd93f80593bfee3eb2da8c8f0d3992da (diff) | |
| download | ffmpeg-7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b.tar.gz | |
Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
avfilter: more correct printf format specifiers
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 4 | ||||
| -rw-r--r-- | libavfilter/vf_showinfo.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 783f9a6e3e..c105efb0fd 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -83,7 +83,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) av_log(ctx, AV_LOG_INFO, "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s channels:%d chlayout:%s rate:%d nb_samples:%d " - "checksum:%08X ", + "checksum:%08"PRIX32" ", inlink->frame_count, av_ts2str(buf->pts), av_ts2timestr(buf->pts, &inlink->time_base), av_frame_get_pkt_pos(buf), @@ -93,7 +93,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) av_log(ctx, AV_LOG_INFO, "plane_checksums: [ "); for (i = 0; i < planes; i++) - av_log(ctx, AV_LOG_INFO, "%08X ", s->plane_checksums[i]); + av_log(ctx, AV_LOG_INFO, "%08"PRIX32" ", s->plane_checksums[i]); av_log(ctx, AV_LOG_INFO, "]\n"); return ff_filter_frame(inlink->dst->outputs[0], buf); diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index ade3e1ae06..de2e994c0d 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -22,6 +22,8 @@ * filter for showing textual video frame information */ +#include <inttypes.h> + #include "libavutil/adler32.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" @@ -56,7 +58,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "n:%"PRId64" pts:%s pts_time:%s pos:%"PRId64" " "fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c " - "checksum:%08X plane_checksum:[%08X", + "checksum:%08"PRIX32" plane_checksum:[%08"PRIX32, inlink->frame_count, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), av_frame_get_pkt_pos(frame), desc->name, @@ -69,7 +71,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) checksum, plane_checksum[0]); for (plane = 1; plane < 4 && frame->data[plane] && frame->linesize[plane]; plane++) - av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]); + av_log(ctx, AV_LOG_INFO, " %08"PRIX32, plane_checksum[plane]); av_log(ctx, AV_LOG_INFO, "]\n"); return ff_filter_frame(inlink->dst->outputs[0], frame); |