virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/md5enc: add format_version, to allow selecting which version to use

Browse Source 
Currently there is just version 1
Fixes remaining part of Ticket2280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-16 22:34:56 +02:00
parent 57641410d1
commit 7da2592f56
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/md5enc.c
View File

@ -30,6 +30,7 @@ struct MD5Context {
const AVClass *avclass; const AVClass *avclass;
struct AVHashContext *hash; struct AVHashContext *hash;
char *hash_name; char *hash_name;
int format_version;
}; };
static void md5_finish(struct AVFormatContext *s, char *buf) static void md5_finish(struct AVFormatContext *s, char *buf)
@ -55,6 +56,7 @@ static void md5_finish(struct AVFormatContext *s, char *buf)
#define ENC AV_OPT_FLAG_ENCODING_PARAM #define ENC AV_OPT_FLAG_ENCODING_PARAM
static const AVOption hash_options[] = { static const AVOption hash_options[] = {
{ "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = "md5"}, 0, 0, ENC }, { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = "md5"}, 0, 0, ENC },
{ "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 1, ENC },
{ NULL }, { NULL },
}; };
@ -118,7 +120,7 @@ static int framemd5_write_header(struct AVFormatContext *s)
if (res < 0) if (res < 0)
return res; return res;
avio_printf(s->pb, "#format: frame checksums\n"); avio_printf(s->pb, "#format: frame checksums\n");
avio_printf(s->pb, "#version: 1\n"); avio_printf(s->pb, "#version: %d\n", c->format_version);
avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash)); avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash));
ff_framehash_write_header(s); ff_framehash_write_header(s);
avio_printf(s->pb, "#stream#, dts, pts, duration, size, hash\n"); avio_printf(s->pb, "#stream#, dts, pts, duration, size, hash\n");