highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hashenc: Deduplicate (stream)hash options

Browse Source 
Also saves relocations.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-01-03 16:00:16 +01:00
parent 5e11dcf52f
commit cb4c3b6162
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/hashenc.c
View File

@ -42,8 +42,8 @@ struct HashContext {
#define FORMAT_VERSION_OPT \ #define FORMAT_VERSION_OPT \
{ "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC } { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC }
#if CONFIG_HASH_MUXER #if CONFIG_HASH_MUXER || CONFIG_STREAMHASH_MUXER
static const AVOption hash_options[] = { static const AVOption hash_streamhash_options[] = {
HASH_OPT("sha256"), HASH_OPT("sha256"),
{ NULL }, { NULL },
}; };
@ -57,13 +57,6 @@ static const AVOption framehash_options[] = {
}; };
#endif #endif
#if CONFIG_STREAMHASH_MUXER
static const AVOption streamhash_options[] = {
HASH_OPT("sha256"),
{ NULL },
};
#endif
#if CONFIG_MD5_MUXER #if CONFIG_MD5_MUXER
static const AVOption md5_options[] = { static const AVOption md5_options[] = {
HASH_OPT("md5"), HASH_OPT("md5"),
@ -174,7 +167,7 @@ static void hash_free(struct AVFormatContext *s)
static const AVClass hashenc_class = { static const AVClass hashenc_class = {
.class_name = "hash muxer", .class_name = "hash muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = hash_options, .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
@ -222,7 +215,7 @@ AVOutputFormat ff_md5_muxer = {
static const AVClass streamhashenc_class = { static const AVClass streamhashenc_class = {
.class_name = "stream hash muxer", .class_name = "stream hash muxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = streamhash_options, .option = hash_streamhash_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };