]> git.sesse.net Git - vlc/commitdiff
* Fix the microdvd subs. i forgot that framerate != frameduration :D
authorDerk-Jan Hartman <hartman@videolan.org>
Mon, 28 Aug 2006 17:02:52 +0000 (17:02 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Mon, 28 Aug 2006 17:02:52 +0000 (17:02 +0000)
modules/demux/subtitle.c

index 75c0448da32c7c206d4affaa144318c83754e476..4240a31d5ae1a698d33bee4512e3534861e8f4c3 100644 (file)
@@ -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 */