vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Wed Jul 4 14:30:29 2018 +0200| [dd422c7d65e7e5bcc9f50a9958eaa0e5e87b749c] | committer: Steve Lhomme
scte27: use the frame duration in vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd422c7d65e7e5bcc9f50a9958eaa0e5e87b749c --- modules/codec/scte27.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/codec/scte27.c b/modules/codec/scte27.c index 529906b50f..e8385faf51 100644 --- a/modules/codec/scte27.c +++ b/modules/codec/scte27.c @@ -358,33 +358,33 @@ static subpicture_t *DecodeSubtitleMessage(decoder_t *dec, subpicture_region_Delete(region); return NULL; } - int frame_duration; + vlc_tick_t frame_duration; switch (display_standard) { case 0: sub->i_original_picture_width = 720; sub->i_original_picture_height = 480; - frame_duration = 33367; + frame_duration = VLC_TICK_FROM_US(33367); break; case 1: sub->i_original_picture_width = 720; sub->i_original_picture_height = 576; - frame_duration = 40000; + frame_duration = VLC_TICK_FROM_MS(40); break; case 2: sub->i_original_picture_width = 1280; sub->i_original_picture_height = 720; - frame_duration = 16683; + frame_duration = VLC_TICK_FROM_US(16683); break; case 3: sub->i_original_picture_width = 1920; sub->i_original_picture_height = 1080; - frame_duration = 16683; + frame_duration = VLC_TICK_FROM_US(16683); break; default: msg_Warn(dec, "Unknown display standard"); sub->i_original_picture_width = 0; sub->i_original_picture_height = 0; - frame_duration = 40000; + frame_duration = VLC_TICK_FROM_MS(40); break; } sub->b_absolute = true; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits