diff mbox series

[FFmpeg-devel,09/16] avformat/hashenc: Deduplicate (stream)hash options

Message ID 20210104002816.2321974-9-andreas.rheinhardt@gmail.com
State Accepted
Commit cb4c3b616288fa8ce384ede6324fc5b547061349
Headers show
Series [FFmpeg-devel,01/16] avcodec/g723_1: Deduplicate arrays
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 4, 2021, 12:28 a.m. UTC
Also saves relocations.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/hashenc.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
diff mbox series

Patch

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,
 };