Skip to content

V
vlc-2-2
Commit 16b2dec1 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fix the microdvd subs. i forgot that framerate != frameduration :D

parent 6e3dbc37
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/demux/subtitle.c
View file @ 16b2dec1
...@@ -709,6 +709,7 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle ) ...@@ -709,6 +709,7 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle )
p_subtitle->i_stop = 0; p_subtitle->i_stop = 0;
p_subtitle->psz_text = NULL; p_subtitle->psz_text = NULL;
next:
for( ;; ) for( ;; )
{ {
if( ( s = TextGetLine( txt ) ) == NULL ) if( ( s = TextGetLine( txt ) ) == NULL )
...@@ -730,7 +731,8 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle ) ...@@ -730,7 +731,8 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle )
/* We found a possible setting of the framerate "{1}{1}23.976" */ /* We found a possible setting of the framerate "{1}{1}23.976" */
float tmp = us_strtod( buffer_text, NULL ); float tmp = us_strtod( buffer_text, NULL );
if( tmp > 0.0 && !var_GetFloat( p_demux, "sub-fps" ) > 0.0 ) if( tmp > 0.0 && !var_GetFloat( p_demux, "sub-fps" ) > 0.0 )
p_sys->i_microsecperframe = tmp; p_sys->i_microsecperframe = (int64_t)( (float)1000000 / tmp );
goto next;
} }
/* replace | by \n */ /* replace | by \n */
......
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