[FFmpeg-cvslog] vf_showinfo: print checksums in hexadecimal.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Oct 27 22:14:57 2011 +0200| [a0b7853f7a4bd323df1f3db2c15d61e2178033bc] | committer: Clément Bœsch

vf_showinfo: print checksums in hexadecimal.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0b7853f7a4bd323df1f3db2c15d61e2178033bc
---

 doc/filters.texi           |   13 +++++++------
 libavfilter/af_ashowinfo.c |    2 +-
 libavfilter/avfilter.h     |    2 +-
 libavfilter/vf_showinfo.c  |    2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 76266af..9530112 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}
+ at 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 0ad7252..9156eb5 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 5d204e7..33c74c5 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 9ce50f4..d0bb0d1 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,