libhb: update iso639 language codes (HandBrake#5978)

* libhb: update iso639 language codes * LinGui: fix crash when there is no iso639_1 code
luokery · Apr 21, 2024 · 6b90700 · 6b90700
1 parent 267fda4
commit 6b90700
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
@@ -2133,7 +2133,16 @@ language_opts_set(signal_user_data_t *ud, const gchar *name,
     for (iso639 = lang_get_next(NULL); iso639 != NULL;
          iso639 = lang_get_next(iso639))
     {
-        int     index = lang_lookup_index(iso639->iso639_1);
+        int     index;
+
+        if (iso639->iso639_1 != NULL && iso639->iso639_1[0] != 0)
+        {
+            index = lang_lookup_index(iso639->iso639_1);
+        }
+        else
+        {
+            index = lang_lookup_index(iso639->iso639_2);
+        }
         gchar * lang;
 
         if (iso639->native_name[0] != 0)

diff --git a/libhb/lang.c b/libhb/lang.c
@@ -51,7 +51,12 @@ static const iso639_lang_t languages[] =
   { "Cornish", "kernewek", "kw", "cor" },
   { "Corsican", "Corsu", "co", "cos" },
   { "Cree", "", "cr", "cre" },
-  { "Croatian", "hrvatski", "hr", "hrv", "scr" },
+  { "Croatian", "hrvatski", "hr", "hrv" },
+  // Deprecated version of Croatian code 'scr'
+  // When used, HB will record the latest iso639_2 'hrv' as the code in titles
+  // and write the correct code to the output since the line above that has
+  // no 2b variant will be used when generating output.
+  { "Croatian", "hrvatski", NULL, "hrv", "scr" },
   { "Czech", "čeština", "cs", "ces", "cze" },
   { "Danish", "dansk", "da", "dan" },
   { "Divehi", "ދިވެހިބަސް", "dv", "div" },
@@ -65,6 +70,7 @@ static const iso639_lang_t languages[] =
   { "Fijian", "Na Vosa Vakaviti", "fj", "fij" },
   { "Finnish", "suomi", "fi", "fin" },
   { "French", "Francais", "fr", "fra", "fre" },
+  { "Filipino", "Wikang Filipino", NULL, "fil" },
   { "Western Frisian", "Frysk", "fy", "fry" },
   { "Fulah", "Fulah", "ff", "ful" },
   { "Georgian", "ქართული", "ka", "kat", "geo" },
@@ -122,7 +128,7 @@ static const iso639_lang_t languages[] =
   { "Malayalam", "മലയാളം", "ml", "mal" },
   { "Maori", "Reo Māori", "mi", "mri", "mao" },
   { "Marathi", "मराठी", "mr", "mar" },
-  { "Malay", "Bahasa Melayu", "ms", "msa", "msa" },
+  { "Malay", "Bahasa Melayu", "ms", "msa", "may" },
   { "Malagasy", "Malagasy", "mg", "mlg" },
   { "Maltese", "Malti", "mt", "mlt" },
   { "Moldavian", "limba moldovenească", "mo", "mol" },