virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf/md5enc: Use AV_HASH_MAX_SIZE

Browse Source 
Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2013-06-15 14:03:37 -03:00
parent b6249acae6
commit 1bb005ce54
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/md5enc.c
View File

@@ -35,7 +35,7 @@ struct MD5Context {
static void md5_finish(struct AVFormatContext *s, char *buf) static void md5_finish(struct AVFormatContext *s, char *buf)
{ {
struct MD5Context *c = s->priv_data; struct MD5Context *c = s->priv_data;
uint8_t md5[32]; uint8_t md5[AV_HASH_MAX_SIZE];
int i, offset = strlen(buf); int i, offset = strlen(buf);
int len = av_hash_get_size(c->hash); int len = av_hash_get_size(c->hash);
av_assert0(len > 0 && len <= sizeof(md5)); av_assert0(len > 0 && len <= sizeof(md5));
@@ -86,9 +86,9 @@ static int write_packet(struct AVFormatContext *s, AVPacket *pkt)
static int write_trailer(struct AVFormatContext *s) static int write_trailer(struct AVFormatContext *s)
{ {
struct MD5Context *c = s->priv_data; struct MD5Context *c = s->priv_data;
char buf[128]; char buf[256];
av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 100); av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 200);
av_strlcat(buf, "=", sizeof(buf) - 100); av_strlcat(buf, "=", sizeof(buf) - 200);
md5_finish(s, buf); md5_finish(s, buf);

2
libavformat/version.h
View File

@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 8 #define LIBAVFORMAT_VERSION_MINOR 8
#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \