diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-12 17:17:47 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-04-12 17:18:57 +0300 |
| commit | e3111b1ff8592b7bafe5accd9708e7f3cab60adb (patch) | |
| tree | 8328189a9f9f6adcd1d272d27dbde77b081e0843 /libavformat/hashenc.c | |
| parent | f4a0236cbd75249418b40e8aa88b0264c0b58b69 (diff) | |
avformat/framehash: Add more information to the output
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/hashenc.c')
| -rw-r--r-- | libavformat/hashenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index ef886a04a0..614c8157a5 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -57,7 +57,7 @@ static void hash_finish(struct AVFormatContext *s, char *buf) #if CONFIG_HASH_MUXER || CONFIG_FRAMEHASH_MUXER static const AVOption hash_options[] = { { "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str = "sha256"}, 0, 0, ENC }, - { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 1, ENC }, + { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 2, ENC }, { NULL }, }; #endif @@ -65,7 +65,7 @@ static const AVOption hash_options[] = { #if CONFIG_MD5_MUXER || CONFIG_FRAMEMD5_MUXER static const AVOption md5_options[] = { { "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 }, + { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 1}, 1, 2, ENC }, { NULL }, }; #endif @@ -158,7 +158,7 @@ static int framehash_write_header(struct AVFormatContext *s) avio_printf(s->pb, "#format: frame checksums\n"); avio_printf(s->pb, "#version: %d\n", c->format_version); avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash)); - ff_framehash_write_header(s); + ff_framehash_write_header(s, c->format_version); avio_printf(s->pb, "#stream#, dts, pts, duration, size, hash\n"); return 0; } |