aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-10-27 22:14:57 +0200
committerClément Bœsch <ubitux@gmail.com>2011-10-27 22:14:57 +0200
commita0b7853f7a4bd323df1f3db2c15d61e2178033bc (patch)
tree6a63584fb71c80959efffa9b9c6fe3ba4d5baa16
parentc643ba81283d44618df2ec675e2b8deea73825ca (diff)
downloadffmpeg-a0b7853f7a4bd323df1f3db2c15d61e2178033bc.tar.gz
vf_showinfo: print checksums in hexadecimal.
-rw-r--r--doc/filters.texi13
-rw-r--r--libavfilter/af_ashowinfo.c2
-rw-r--r--libavfilter/avfilter.h2
-rw-r--r--libavfilter/vf_showinfo.c2
4 files changed, 10 insertions, 9 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 76266af37b..9530112e32 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -216,11 +216,12 @@ sample rate for the audio frame
if the packing format is planar, 0 if packed
@item checksum
-Adler-32 checksum of all the planes of the input frame
+Adler-32 checksum (printed in hexadecimal) of all the planes of the input frame
@item plane_checksum
-Adler-32 checksum for each input frame plane, expressed in the form
-"[@var{c0} @var{c1} @var{c2} @var{c3} @var{c4} @var{c5} @var{c6} @var{c7}]"
+Adler-32 checksum (printed in hexadecimal) for each input frame plane,
+expressed in the form "[@var{c0} @var{c1} @var{c2} @var{c3} @var{c4} @var{c5}
+@var{c6} @var{c7}]"
@end table
@c man end AUDIO FILTERS
@@ -2187,11 +2188,11 @@ the @code{av_get_picture_type_char} function defined in
@file{libavutil/avutil.h}.
@item checksum
-Adler-32 checksum of all the planes of the input frame
+Adler-32 checksum (printed in hexadecimal) of all the planes of the input frame
@item plane_checksum
-Adler-32 checksum of each plane of the input frame, expressed in the form
-"[@var{c0} @var{c1} @var{c2} @var{c3}]"
+Adler-32 checksum (printed in hexadecimal) of each plane of the input frame,
+expressed in the form "[@var{c0} @var{c1} @var{c2} @var{c3}]"
@end table
@section slicify
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index 0ad7252421..9156eb5631 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -65,7 +65,7 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
av_log(ctx, AV_LOG_INFO,
"n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" "
"fmt:%s chlayout:%s nb_samples:%d rate:%d planar:%d "
- "checksum:%u plane_checksum[%u %u %u %u %u %u %u %u]\n",
+ "checksum:%08X plane_checksum[%08X %08X %08X %08X %08X %08X %08X %08X]\n",
showinfo->frame,
samplesref->pts, samplesref->pts * av_q2d(inlink->time_base),
samplesref->pos,
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 5d204e7151..33c74c59ff 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 45
-#define LIBAVFILTER_VERSION_MICRO 0
+#define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 9ce50f44ba..d0bb0d1eff 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -61,7 +61,7 @@ static void end_frame(AVFilterLink *inlink)
av_log(ctx, AV_LOG_INFO,
"n:%d pts:%"PRId64" pts_time:%f pos:%"PRId64" "
"fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
- "checksum:%u plane_checksum:[%u %u %u %u]\n",
+ "checksum:%08X plane_checksum:[%08X %08X %08X %08X]\n",
showinfo->frame,
picref->pts, picref ->pts * av_q2d(inlink->time_base), picref->pos,
av_pix_fmt_descriptors[picref->format].name,