[vlc-commits] demux ts: fix EITConvertToUTF8 to deal with no longer broken providers

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Oct  2 17:38:28 2012 +0200| [e82b763a47c789cda01db48e693a59d184e391c1] | committer: Francois Cartegnie

demux ts: fix EITConvertToUTF8 to deal with no longer broken providers
(fix #7537)

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

 modules/demux/ts.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index d5583d8..19970ac 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -2498,6 +2498,13 @@ static char *EITConvertToUTF8( const unsigned char *psz_instring,
                                size_t i_length,
                                bool b_broken )
 {
+    /* Deal with no longer broken providers (no switch byte
+      but sending ISO_8859-1 instead of ISO_6937) without
+      removing them from the broken providers table
+      (keep the entry for correctly handling recorded TS).
+    */
+    b_broken = b_broken && i_length && *psz_instring > 0x20;
+
     if( b_broken )
         return FromCharset( "ISO_8859-1", psz_instring, i_length );
     return vlc_from_EIT( psz_instring, i_length );