"subviewer1"
};
-vlc_module_begin();
- set_shortname( N_("Subtitles"));
- set_description( N_("Text subtitles parser") );
- set_capability( "demux", 0 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
+vlc_module_begin ()
+ set_shortname( N_("Subtitles"))
+ set_description( N_("Text subtitles parser") )
+ set_capability( "demux", 0 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
add_float( "sub-fps", 0.0, NULL,
N_("Frames per second"),
SUB_FPS_LONGTEXT, true );
add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
SUB_TYPE_LONGTEXT, true );
change_string_list( ppsz_sub_type, NULL, NULL );
- set_callbacks( Open, Close );
+ set_callbacks( Open, Close )
- add_shortcut( "subtitle" );
-vlc_module_end();
+ add_shortcut( "subtitle" )
+vlc_module_end ()
/*****************************************************************************
* Prototypes:
/* Quit on unknown subtitles */
if( p_sys->i_type == SUB_TYPE_UNKNOWN )
{
- msg_Err( p_demux, "failed to recognize subtitle type" );
+ msg_Warn( p_demux, "failed to recognize subtitle type" );
free( p_sys );
return VLC_EGENERIC;
}
}
}
- while( psz_text[ strlen( psz_text ) - 1 ] == '\\' )
- {
+ while( psz_text[ strlen( psz_text ) - 1 ] == '\\' )
+ {
const char *s2 = TextGetLine( txt );
if( !s2 )
+ {
+ free( psz_orig );
return VLC_EGENERIC;
+ }
int i_len = strlen( s2 );
if( i_len == 0 )
psz_orig = psz_text;
strcat( psz_text, s2 );
- }
+ }
/* Skip the blanks */
while( *psz_text == ' ' || *psz_text == '\t' ) psz_text++;
int h1 = 0, m1 = 0, s1 = 0, f1 = 0;
int h2 = 0, m2 = 0, s2 = 0, f2 = 0;
const char *s = TextGetLine( txt );
+ free( psz_text );
if( !s )
- {
- free( psz_text );
return VLC_EGENERIC;
- }
psz_text = malloc( strlen( s ) + 1 );
if( !psz_text )
psz_begin, psz_text ) != 2) )
/* Line is not recognized */
{
- free( psz_text );
continue;
}
}
break;
}
- /* Line is not recognized */
- else
- {
- free( psz_text );
- continue;
- }
}
/* Get the following Lines */
const char *s = TextGetLine( txt );
if( !s )
+ {
+ free( psz_text );
return VLC_EGENERIC;
+ }
int i_len = strlen( s );
if( i_len == 0 ) break;