From 16b2dec13b17f1b22a793836c75782fc5b847519 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman <hartman@videolan.org> Date: Mon, 28 Aug 2006 17:02:52 +0000 Subject: [PATCH] * Fix the microdvd subs. i forgot that framerate != frameduration :D --- modules/demux/subtitle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 75c0448da32c..4240a31d5ae1 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -709,6 +709,7 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle ) p_subtitle->i_stop = 0; p_subtitle->psz_text = NULL; +next: for( ;; ) { if( ( s = TextGetLine( txt ) ) == NULL ) @@ -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" */ float tmp = us_strtod( buffer_text, NULL ); 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 */ -- GitLab