| Message ID | 20190211224206.30345-1-cus@passwd.hu |
|---|---|
| State | Accepted |
| Commit | dd6dd49f1d5e5092d7f2da8b2af0fa89b2be99c1 |
| Headers | show |
2019-02-11 23:42 GMT+01:00, Marton Balint <cus@passwd.hu>: > ISO-10646 alone means UCS-4 for iconv, the specs refers to the Basic > Multilingual Plane (BMP), therefore we need UCS-2. VLC also using that. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavformat/mpegts.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c > index b347ec1736..2594b1eeb1 100644 > --- a/libavformat/mpegts.c > +++ b/libavformat/mpegts.c > @@ -683,7 +683,7 @@ static char *getstr8(const uint8_t **pp, const uint8_t > *p_end) > "ISO6937", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7", > "ISO-8859-8", "ISO-8859-9", "ISO-8859-10", "ISO-8859-11", > "", "ISO-8859-13", "ISO-8859-14", "ISO-8859-15", "", "", "", > "", > - "", "ISO-10646", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", > "", > + "", "UCS-2BE", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", > "", If you believe this is correct, please commit. Carl Eugen
On Tue, 12 Feb 2019, Carl Eugen Hoyos wrote: > 2019-02-11 23:42 GMT+01:00, Marton Balint <cus@passwd.hu>: >> ISO-10646 alone means UCS-4 for iconv, the specs refers to the Basic >> Multilingual Plane (BMP), therefore we need UCS-2. VLC also using that. >> >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> libavformat/mpegts.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c >> index b347ec1736..2594b1eeb1 100644 >> --- a/libavformat/mpegts.c >> +++ b/libavformat/mpegts.c >> @@ -683,7 +683,7 @@ static char *getstr8(const uint8_t **pp, const uint8_t >> *p_end) >> "ISO6937", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7", >> "ISO-8859-8", "ISO-8859-9", "ISO-8859-10", "ISO-8859-11", >> "", "ISO-8859-13", "ISO-8859-14", "ISO-8859-15", "", "", "", >> "", >> - "", "ISO-10646", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", >> "", >> + "", "UCS-2BE", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", >> "", > > If you believe this is correct, please commit. Thanks, applied. Regards, Marton
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b347ec1736..2594b1eeb1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -683,7 +683,7 @@ static char *getstr8(const uint8_t **pp, const uint8_t *p_end) "ISO6937", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7", "ISO-8859-8", "ISO-8859-9", "ISO-8859-10", "ISO-8859-11", "", "ISO-8859-13", "ISO-8859-14", "ISO-8859-15", "", "", "", "", - "", "ISO-10646", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", "", + "", "UCS-2BE", "KSC_5601", "GB2312", "UCS-2BE", "UTF-8", "", "", "", "", "", "", "", "", "", "" }; iconv_t cd;
ISO-10646 alone means UCS-4 for iconv, the specs refers to the Basic Multilingual Plane (BMP), therefore we need UCS-2. VLC also using that. Signed-off-by: Marton Balint <cus@passwd.hu> --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)