vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Thu Jun 14 13:10:36 2018 +0200| [13f81022cf3b44e4204a4001854d7a43cab595ac] | committer: Steve Lhomme
linsys: increment values are in vlc_tick_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13f81022cf3b44e4204a4001854d7a43cab595ac --- modules/access/linsys/linsys_hdsdi.c | 6 +++--- modules/access/linsys/linsys_sdi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/access/linsys/linsys_hdsdi.c b/modules/access/linsys/linsys_hdsdi.c index 22c2007f39..44c2ec2382 100644 --- a/modules/access/linsys/linsys_hdsdi.c +++ b/modules/access/linsys/linsys_hdsdi.c @@ -148,7 +148,7 @@ typedef struct unsigned int i_width, i_height, i_aspect, i_forced_aspect; unsigned int i_vblock_size, i_ablock_size; vlc_tick_t i_next_vdate, i_next_adate; - int i_incr, i_aincr; + vlc_tick_t i_incr, i_aincr; /* ES stuff */ int i_id_video; @@ -495,7 +495,7 @@ static int InitVideo( demux_t *p_demux ) } p_sys->i_next_vdate = START_DATE; - p_sys->i_incr = 1000000 * p_sys->i_frame_rate_base / p_sys->i_frame_rate; + p_sys->i_incr = CLOCK_FREQ * p_sys->i_frame_rate_base / p_sys->i_frame_rate; p_sys->i_vblock_size = p_sys->i_width * p_sys->i_height * 3 / 2 + sizeof(struct block_extension_t); @@ -544,7 +544,7 @@ static int InitAudio( demux_t *p_demux ) p_sys->i_next_adate = START_DATE; p_sys->i_ablock_size = p_sys->i_sample_rate * 4 * p_sys->i_frame_rate_base / p_sys->i_frame_rate; - p_sys->i_aincr = 1000000 * p_sys->i_ablock_size / (p_sys->i_sample_rate * 4); + p_sys->i_aincr = CLOCK_FREQ * p_sys->i_ablock_size / (p_sys->i_sample_rate * 4); return VLC_SUCCESS; } diff --git a/modules/access/linsys/linsys_sdi.c b/modules/access/linsys/linsys_sdi.c index 4c78fbb9ab..f123aa5819 100644 --- a/modules/access/linsys/linsys_sdi.c +++ b/modules/access/linsys/linsys_sdi.c @@ -179,7 +179,7 @@ typedef struct bool b_hd, b_vbi; vbi_raw_decoder rd_wss, rd_telx; vlc_tick_t i_next_date; - int i_incr; + vlc_tick_t i_incr; /* ES stuff */ int i_id_video; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits