Commit 6f9ce7c3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Commit the good version of the file.

For the ones who wants to look at it, here is a complex script
http://unicorn.us.com/jacosub/demo.txt
parent 856853ae
...@@ -1373,14 +1373,15 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1373,14 +1373,15 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
if( !s ) if( !s )
return VLC_EGENERIC; return VLC_EGENERIC;
if( strstr( s, "FORMAT" ) )
{
if( sscanf (s, "FORMAT=TIM%c", &p_dummy ) == 1 && p_dummy == 'E') if( sscanf (s, "FORMAT=TIM%c", &p_dummy ) == 1 && p_dummy == 'E')
{ {
mpsub_factor = 100.0; mpsub_factor = 100.0;
break; break;
} }
psz_temp = malloc( strlen(s) - 6 ); psz_temp = malloc( strlen(s) );
if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) ) if( sscanf( s, "FORMAT=%[^\r\n]", psz_temp ) )
{ {
float f_fps; float f_fps;
...@@ -1393,7 +1394,7 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1393,7 +1394,7 @@ static int ParseMPSub( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
break; break;
} }
free( psz_temp ); free( psz_temp );
}
/* Data Lines */ /* Data Lines */
if( sscanf (s, "%f %f", &f1, &f2 ) == 2 ) if( sscanf (s, "%f %f", &f1, &f2 ) == 2 )
{ {
...@@ -1616,12 +1617,9 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1616,12 +1617,9 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
while ( *s2 == ' ' ) s2++; while ( *s2 == ' ' ) s2++;
/* int i_len = strlen( psz_orig2 ); /* Here to parse the second line, we should add s2 to
psz_text and go on the for( ) line 1556 in order to
parse the next line.
psz_orig2 = realloc( psz_orig2, strlen( s2 ) + i_len + 1 );
*/ */
} }
default: default:
......
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