]> git.sesse.net Git - vlc/commitdiff
demux ts: fix EITConvertToUTF8 to deal with no longer broken providers
authorFrancois Cartegnie <fcvlcdev@free.fr>
Tue, 2 Oct 2012 15:38:28 +0000 (17:38 +0200)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Thu, 4 Oct 2012 12:47:30 +0000 (14:47 +0200)
(fix #7537)

modules/demux/ts.c

index d5583d8c0e4e2c8f462edbfbec62547e29a9f993..19970ac980ba70223ab07a952da9092a2ea3f95e 100644 (file)
@@ -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 );