diff options
| -rw-r--r-- | libhb/handbrake/preset_builtin.h | 2 | ||||
| -rw-r--r-- | libhb/preset.c | 42 | ||||
| -rw-r--r-- | preset/preset_builtin.list | 2 |
3 files changed, 44 insertions, 2 deletions
diff --git a/libhb/handbrake/preset_builtin.h b/libhb/handbrake/preset_builtin.h index 0dc1f64cf..a2020d57c 100644 --- a/libhb/handbrake/preset_builtin.h +++ b/libhb/handbrake/preset_builtin.h @@ -8982,7 +8982,7 @@ const char hb_builtin_presets_json[] = " \"x264Option\": \"\", \n" " \"x264UseAdvancedOptions\": false\n" " }, \n" -" \"VersionMajor\": 40, \n" +" \"VersionMajor\": 41, \n" " \"VersionMicro\": 0, \n" " \"VersionMinor\": 0\n" " }\n" diff --git a/libhb/preset.c b/libhb/preset.c index 4f486ab01..7df3e3159 100644 --- a/libhb/preset.c +++ b/libhb/preset.c @@ -2515,6 +2515,36 @@ static hb_value_t * import_hierarchy_29_0_0(hb_value_t *presets) return hb_value_dup(presets); } +static void und_to_any(hb_value_array_t * list) +{ + if (list == NULL) + { + return; + } + + int count = hb_value_array_len(list); + int ii; + for (ii = 0; ii < count; ii++) + { + const char *lang; + lang = hb_value_get_string(hb_value_array_get(list, ii)); + if (!strcasecmp(lang, "und")) + { + hb_value_array_set(list, ii, hb_value_string("any")); + } + } +} + +static void import_lang_list_40_0_0(hb_value_t *preset) +{ + hb_value_array_t * lang_list; + + lang_list = hb_dict_get(preset, "AudioLanguageList"); + und_to_any(lang_list); + lang_list = hb_dict_get(preset, "SubtitleLanguageList"); + und_to_any(lang_list); +} + static void import_deblock_35_0_0(hb_value_t *preset) { int deblock = hb_dict_get_int(preset, "PictureDeblock"); @@ -3154,9 +3184,16 @@ static void import_video_0_0_0(hb_value_t *preset) } } +static void import_40_0_0(hb_value_t *preset) +{ + import_lang_list_40_0_0(preset); +} + static void import_35_0_0(hb_value_t *preset) { import_deblock_35_0_0(preset); + + import_40_0_0(preset); } static void import_25_0_0(hb_value_t *preset) @@ -3276,6 +3313,11 @@ static int preset_import(hb_value_t *preset, int major, int minor, int micro) import_35_0_0(preset); result = 1; } + else if (cmpVersion(major, minor, micro, 40, 0, 0) <= 0) + { + import_40_0_0(preset); + result = 1; + } preset_clean(preset, hb_preset_template); } return result; diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list index f462de31a..36b82f366 100644 --- a/preset/preset_builtin.list +++ b/preset/preset_builtin.list @@ -1,6 +1,6 @@ <resources> <section name="PresetTemplate"> - <integer name="VersionMajor" value="40" /> + <integer name="VersionMajor" value="41" /> <integer name="VersionMinor" value="0" /> <integer name="VersionMicro" value="0" /> <json name="Preset" file="preset_template.json" /> |