[FFmpeg-cvslog] avformat/mpegts: fix charset of type 0x11

Marton Balint git at videolan.org
Thu Feb 14 00:54:05 EET 2019


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Feb 10 00:25:05 2019 +0100| [dd6dd49f1d5e5092d7f2da8b2af0fa89b2be99c1] | committer: Marton Balint

avformat/mpegts: fix charset of type 0x11

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 at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd6dd49f1d5e5092d7f2da8b2af0fa89b2be99c1
---

 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", "", "",
             "", "", "", "", "", "", "", ""
         };
         iconv_t cd;



More information about the ffmpeg-cvslog mailing list