# HG changeset patch # User ivo # Date 1151871779 0 # Node ID 21f45afa0f8753c01ac02319874b7a0fd0a604b3 # Parent 27a9bb3b9b9a4c846b7d2f349eb70de8ecd0a29c use libavutil's md5 implementation instead of local imported copy diff -r 27a9bb3b9b9a -r 21f45afa0f87 libvo/vo_md5sum.c --- a/libvo/vo_md5sum.c Sun Jul 02 20:21:27 2006 +0000 +++ b/libvo/vo_md5sum.c Sun Jul 02 20:22:59 2006 +0000 @@ -10,6 +10,7 @@ * * Changelog * + * 2006-07-02 Removed imported md5sum code and rely on libavutil now * 2005-01-16 Replaced suboption parser by call to subopt-helper. * 2004-09-16 Second draft. It now acts on VOCTRL_DRAW_IMAGE and does not * maintain a local copy of the image if the format is YV12. @@ -38,7 +39,7 @@ #include "video_out_internal.h" #include "mplayer.h" /* for exit_player() */ #include "help_mp.h" -#include "md5sum.h" +#include "libavutil/md5.h" /* ------------------------------------------------------------------------- */ @@ -201,22 +202,23 @@ uint32_t strideU = mpi->stride[1]; uint32_t strideV = mpi->stride[2]; - auth_md5Ctx md5_context; + uint8_t md5_context_memory[av_md5_size]; + struct AVMD5 *md5_context = (struct AVMD5*) md5_context_memory; unsigned int i; if (mpi->flags & MP_IMGFLAG_PLANAR) { /* Planar */ if (mpi->flags & MP_IMGFLAG_YUV) { /* Planar YUV */ - auth_md5InitCtx(&md5_context); + av_md5_init(md5_context); for (i=0; iw * (mpi->bpp >> 3) * mpi->h); + av_md5_sum(md5sum, rgbimage, mpi->w * (mpi->bpp >> 3) * mpi->h); md5sum_output_sum(md5sum); return VO_TRUE; }