aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-04-21 17:22:22 +0200
committerNicolas George <george@nsup.org>2014-04-29 13:24:17 +0200
commit3926a30b58f6245c733d28102278b6917ec1bbf5 (patch)
treea85584ccb3c9a2abb88f742b745d35621e5daf25 /tools
parentb804eb4323a01f55727ac48475a9e3c257532ab5 (diff)
downloadffmpeg-3926a30b58f6245c733d28102278b6917ec1bbf5.tar.gz
tools/ffhash: use av_hash_final_hex().
Diffstat (limited to 'tools')
-rw-r--r--tools/ffhash.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/tools/ffhash.c b/tools/ffhash.c
index 086d48a7ab..9a8f2aa546 100644
--- a/tools/ffhash.c
+++ b/tools/ffhash.c
@@ -40,7 +40,6 @@
#define SIZE 65536
static struct AVHashContext *hash;
-static uint8_t *res;
static void usage(void)
{
@@ -60,12 +59,10 @@ static void usage(void)
static void finish(void)
{
- int i, len = av_hash_get_size(hash);
+ char res[2 * AV_HASH_MAX_SIZE + 1];
- printf("%s=0x", av_hash_get_name(hash));
- av_hash_final(hash, res);
- for (i = 0; i < len; i++)
- printf("%02x", res[i]);
+ av_hash_final_hex(hash, res, sizeof(res));
+ printf("%s=0x%s", av_hash_get_name(hash), res);
}
static int check(char *file)
@@ -130,11 +127,6 @@ int main(int argc, char **argv)
}
return 1;
}
- res = av_malloc(av_hash_get_size(hash));
- if (!res) {
- printf("%s\n", strerror(errno));
- return 1;
- }
for (i = 2; i < argc; i++)
ret |= check(argv[i]);
@@ -143,7 +135,6 @@ int main(int argc, char **argv)
ret |= check(NULL);
av_hash_freep(&hash);
- av_freep(&res);
return ret;
}