vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Jun 1 17:09:18 2018 +0200| [0e96c111023f1a411b7898c8436cff224ae0b342] | committer: Steve Lhomme
demux: subtitle: i_microsecperframe is an vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0e96c111023f1a411b7898c8436cff224ae0b342 --- modules/demux/subtitle.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 8733d883e4..5490b2a8fc 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -138,7 +138,7 @@ typedef struct typedef struct { enum subtitle_type_e i_type; - int64_t i_microsecperframe; + vlc_tick_t i_microsecperframe; char *psz_header; /* SSA */ @@ -338,7 +338,7 @@ static int Open ( vlc_object_t *p_this ) f_fps = var_CreateGetFloat( p_demux, "sub-fps" ); if( f_fps >= 1.f ) { - p_sys->props.i_microsecperframe = llroundf( 1000000.f / f_fps ); + p_sys->props.i_microsecperframe = llroundf( (float)CLOCK_FREQ / f_fps ); msg_Dbg( p_demux, "Override subtitle fps %f", (double) f_fps ); } @@ -1012,7 +1012,7 @@ static int ParseMicroDvd( vlc_object_t *p_obj, subs_properties_t *p_props, /* Check if it's usable, and if the sub-fps is not set */ float f_fps = us_strtof( psz_text, NULL ); if( f_fps > 0.f && var_GetFloat( p_obj, "sub-fps" ) <= 0.f ) - p_props->i_microsecperframe = llroundf(1000000.f / f_fps); + p_props->i_microsecperframe = llroundf((float)CLOCK_FREQ / f_fps); } free( psz_text ); } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits