Commit bb010625 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix a \n bug and a memory bug in the SSA/subsdec.

parent 7e6fdd0d
...@@ -183,7 +183,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -183,7 +183,7 @@ static int OpenDecoder( vlc_object_t *p_this )
char *psz_charset =(char*)malloc( 100 ); char *psz_charset =(char*)malloc( 100 );
#ifdef __APPLE__ #ifdef __APPLE__
/* Most subtitles are not in UTF-8, which is the default on Mac OS X */ /* Most subtitles are not in UTF-8, which is the default on Mac OS X */
psz_charset = "ISO-8859-1"; sprintf( psz_charset, "ISO-8859-1" );
#else #else
vlc_current_charset( &psz_charset ); vlc_current_charset( &psz_charset );
#endif #endif
...@@ -424,7 +424,7 @@ static void ParseSSAString( decoder_t *p_dec, char *psz_subtitle, subpicture_t * ...@@ -424,7 +424,7 @@ static void ParseSSAString( decoder_t *p_dec, char *psz_subtitle, subpicture_t *
i_text = 0; i_text = 0;
while( psz_buffer_sub[0] != '\0' ) while( psz_buffer_sub[0] != '\0' )
{ {
if( psz_buffer_sub[0] == '\\' && psz_buffer_sub[0] == 'n' ) if( psz_buffer_sub[0] == '\\' && psz_buffer_sub[1] == 'n' )
{ {
psz_new_subtitle[i_text] = ' '; psz_new_subtitle[i_text] = ' ';
i_text++; i_text++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment