| Message ID | 20240124020318.802247-1-marth64@proxyid.net |
|---|---|
| State | Accepted |
| Commit | 01388936a8840a4cce0d4fa9862e6f63c59ffd38 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/avlanguage: add the 6 deprecated DVD languages | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On date Tuesday 2024-01-23 20:03:19 -0600, Marth64 wrote: > There are 6 deprecated ISO language codes that are still valid for DVDs. > This patch allows avlanguage to recognize them correctly. The codes are: > (1) "in" - legacy code for Indonesian, mapped to the modern code > (2) "iw" - legacy code for Hebrew, mapped to the modern code > (3) "ji" - legacy code for Yiddish, mapped to the modern code > (4) "jw" - legacy code for Javanese, published and used as a typoed version of "jv" > (5) "mo" - legacy code for Moldavian, mapped to the inclusive code > (6) "sh" - legacy code for Serbo-Croatian, no modern inclusive code so it is left alone > > All of this can be verified from several sources including: > https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes > > I split this off from the DVD demuxer patch to simplify it a bit. > Sent with git send-email and passes fate, pls let me know if there are issues. > > Thank you, > > Signed-off-by: Marth64 <marth64@proxyid.net> > --- > libavformat/avlanguage.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) LGTM, will apply in a few days if I see no comments.
On date Sunday 2024-01-28 23:27:10 +0100, Stefano Sabatini wrote: > On date Tuesday 2024-01-23 20:03:19 -0600, Marth64 wrote: > > There are 6 deprecated ISO language codes that are still valid for DVDs. > > This patch allows avlanguage to recognize them correctly. The codes are: > > (1) "in" - legacy code for Indonesian, mapped to the modern code > > (2) "iw" - legacy code for Hebrew, mapped to the modern code > > (3) "ji" - legacy code for Yiddish, mapped to the modern code > > (4) "jw" - legacy code for Javanese, published and used as a typoed version of "jv" > > (5) "mo" - legacy code for Moldavian, mapped to the inclusive code > > (6) "sh" - legacy code for Serbo-Croatian, no modern inclusive code so it is left alone > > > > All of this can be verified from several sources including: > > https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes > > > > I split this off from the DVD demuxer patch to simplify it a bit. > > Sent with git send-email and passes fate, pls let me know if there are issues. > > > > Thank you, > > > > Signed-off-by: Marth64 <marth64@proxyid.net> > > --- > > libavformat/avlanguage.c | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > LGTM, will apply in a few days if I see no comments. Applied, thanks again.
Thank you Stefano. Respectfully, On Sat, Feb 3, 2024 at 05:57 Stefano Sabatini <stefasab@gmail.com> wrote: > On date Sunday 2024-01-28 23:27:10 +0100, Stefano Sabatini wrote: > > On date Tuesday 2024-01-23 20:03:19 -0600, Marth64 wrote: > > > There are 6 deprecated ISO language codes that are still valid for > DVDs. > > > This patch allows avlanguage to recognize them correctly. The codes > are: > > > (1) "in" - legacy code for Indonesian, mapped to the modern code > > > (2) "iw" - legacy code for Hebrew, mapped to the modern code > > > (3) "ji" - legacy code for Yiddish, mapped to the modern code > > > (4) "jw" - legacy code for Javanese, published and used as a typoed > version of "jv" > > > (5) "mo" - legacy code for Moldavian, mapped to the inclusive code > > > (6) "sh" - legacy code for Serbo-Croatian, no modern inclusive code so > it is left alone > > > > > > All of this can be verified from several sources including: > > > https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes > > > > > > I split this off from the DVD demuxer patch to simplify it a bit. > > > Sent with git send-email and passes fate, pls let me know if there are > issues. > > > > > > Thank you, > > > > > > Signed-off-by: Marth64 <marth64@proxyid.net> > > > --- > > > libavformat/avlanguage.c | 10 ++++++++-- > > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > LGTM, will apply in a few days if I see no comments. > > Applied, thanks again. >
diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index 782a58adb2..202d9aa835 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -29,7 +29,7 @@ typedef struct LangEntry { uint16_t next_equivalent; } LangEntry; -static const uint16_t lang_table_counts[] = { 484, 20, 184 }; +static const uint16_t lang_table_counts[] = { 484, 20, 190 }; static const uint16_t lang_table_offsets[] = { 0, 484, 504 }; static const LangEntry lang_table[] = { @@ -539,7 +539,7 @@ static const LangEntry lang_table[] = { /*0501*/ { "slk", 647 }, /*0502*/ { "sqi", 652 }, /*0503*/ { "zho", 686 }, - /*----- AV_LANG_ISO639_1 entries (184) -----*/ + /*----- AV_LANG_ISO639_1 entries (190) -----*/ /*0504*/ { "aa" , 0 }, /*0505*/ { "ab" , 1 }, /*0506*/ { "ae" , 33 }, @@ -724,6 +724,12 @@ static const LangEntry lang_table[] = { /*0685*/ { "za" , 478 }, /*0686*/ { "zh" , 78 }, /*0687*/ { "zu" , 480 }, + /*0688*/ { "in" , 195 }, /* deprecated */ + /*0689*/ { "iw" , 172 }, /* deprecated */ + /*0690*/ { "ji" , 472 }, /* deprecated */ + /*0691*/ { "jw" , 202 }, /* deprecated */ + /*0692*/ { "mo" , 358 }, /* deprecated */ + /*0693*/ { "sh" , 693 }, /* deprecated (no equivalent) */ { "", 0 } };
There are 6 deprecated ISO language codes that are still valid for DVDs. This patch allows avlanguage to recognize them correctly. The codes are: (1) "in" - legacy code for Indonesian, mapped to the modern code (2) "iw" - legacy code for Hebrew, mapped to the modern code (3) "ji" - legacy code for Yiddish, mapped to the modern code (4) "jw" - legacy code for Javanese, published and used as a typoed version of "jv" (5) "mo" - legacy code for Moldavian, mapped to the inclusive code (6) "sh" - legacy code for Serbo-Croatian, no modern inclusive code so it is left alone All of this can be verified from several sources including: https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes I split this off from the DVD demuxer patch to simplify it a bit. Sent with git send-email and passes fate, pls let me know if there are issues. Thank you, Signed-off-by: Marth64 <marth64@proxyid.net> --- libavformat/avlanguage.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)