From d0bb9b4a6df07f729774adb63702de956ff85d66 Mon Sep 17 00:00:00 2001
From: Ari Lemmetti <ari.lemmetti@gmail.com>
Date: Tue, 9 Jul 2019 16:26:03 +0300
Subject: [PATCH] Add parameter max-merge to presets

---
 src/cfg.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/cfg.c b/src/cfg.c
index 08dc25a1..950a0af1 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -386,7 +386,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
 
   static const char * const scaling_list_names[] = { "off", "custom", "default", NULL };
 
-  static const char * const preset_values[11][24*2] = {
+  static const char * const preset_values[11][25*2] = {
       {
         "ultrafast",
         "rd", "0",
@@ -412,6 +412,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "28",
+        "max-merge", "5",
         NULL
       },
       {
@@ -439,6 +440,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "28",
+        "max-merge", "5",
         NULL
       },
       {
@@ -466,6 +468,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "28",
+        "max-merge", "5",
         NULL
       },
       {
@@ -493,6 +496,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -520,6 +524,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -547,6 +552,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -574,6 +580,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -601,6 +608,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -628,6 +636,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       {
@@ -655,6 +664,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
         "intra-rdo-et", "0",
         "early-skip", "1",
         "fast-residual-cost", "0",
+        "max-merge", "5",
         NULL
       },
       { NULL }