diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-03 16:00:16 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-01-08 05:06:11 +0100 |
| commit | cb4c3b616288fa8ce384ede6324fc5b547061349 (patch) | |
| tree | 06c789dcfe6a8ac7aefc3508e952310280b20764 /libavformat/hashenc.c | |
| parent | 5e11dcf52f754567c45a06141c7baa5a69546256 (diff) | |
| download | ffmpeg-cb4c3b616288fa8ce384ede6324fc5b547061349.tar.gz | |
avformat/hashenc: Deduplicate (stream)hash options
Also saves relocations.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/hashenc.c')
| -rw-r--r-- | libavformat/hashenc.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index 5523dfd1cd..1e9faf372a 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -42,8 +42,8 @@ struct HashContext { #define FORMAT_VERSION_OPT \ { "format_version", "file format version", OFFSET(format_version), AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC } -#if CONFIG_HASH_MUXER -static const AVOption hash_options[] = { +#if CONFIG_HASH_MUXER || CONFIG_STREAMHASH_MUXER +static const AVOption hash_streamhash_options[] = { HASH_OPT("sha256"), { NULL }, }; @@ -57,13 +57,6 @@ static const AVOption framehash_options[] = { }; #endif -#if CONFIG_STREAMHASH_MUXER -static const AVOption streamhash_options[] = { - HASH_OPT("sha256"), - { NULL }, -}; -#endif - #if CONFIG_MD5_MUXER static const AVOption md5_options[] = { HASH_OPT("md5"), @@ -174,7 +167,7 @@ static void hash_free(struct AVFormatContext *s) static const AVClass hashenc_class = { .class_name = "hash muxer", .item_name = av_default_item_name, - .option = hash_options, + .option = hash_streamhash_options, .version = LIBAVUTIL_VERSION_INT, }; @@ -222,7 +215,7 @@ AVOutputFormat ff_md5_muxer = { static const AVClass streamhashenc_class = { .class_name = "stream hash muxer", .item_name = av_default_item_name, - .option = streamhash_options, + .option = hash_streamhash_options, .version = LIBAVUTIL_VERSION_INT, }; |