Commit 2cb25a4a authored by Thomas Guillem's avatar Thomas Guillem

fixup

parent 1674042b
......@@ -35,6 +35,7 @@
#define VLC_TS_FROM_MS(ms) ((CLOCK_FREQ / INT64_C(1000)) * (ms))
#define VLC_TS_FROM_SEC(sec) (CLOCK_FREQ * (sec))
#define MS_FROM_VLC_TS(vtk) ((vtk) / (CLOCK_FREQ / INT64_C(1000)))
static inline int64_t samples_from_vlc_tick(mtime_t t, int samp_rate)
{
......@@ -116,7 +117,7 @@ var_InheritFourcc(vlc_object_t *obj, const char *name)
X(can_control_rate, bool, add_bool, var_InheritBool, true) \
X(can_record, bool, add_bool, var_InheritBool, true) \
X(error, bool, add_bool, var_InheritBool, false) \
X(pts_delay, unsigned, add_integer, var_InheritUnsigned, MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY)) \
X(pts_delay, unsigned, add_integer, var_InheritUnsigned, MS_FROM_VLC_TS(DEFAULT_PTS_DELAY)) \
X(add_video_track_at, mtime_t, add_integer, var_InheritInteger, VLC_TS_INVALID ) \
X(add_audio_track_at, mtime_t, add_integer, var_InheritInteger, VLC_TS_INVALID ) \
X(add_spu_track_at, mtime_t, add_integer, var_InheritInteger, VLC_TS_INVALID ) \
......@@ -199,7 +200,7 @@ Control(demux_t *demux, int query, va_list args)
*va_arg(args, bool *) = sys->can_control_pace;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
*va_arg(args, vlc_tick_t *) = VLC_TICK_FROM_MS(sys->pts_delay);
*va_arg(args, mtime_t *) = VLC_TS_FROM_MS(sys->pts_delay);
return VLC_SUCCESS;
case DEMUX_GET_META:
return VLC_EGENERIC;
......@@ -596,7 +597,7 @@ DemuxAudio(demux_t *demux, mtime_t step_length, mtime_t end_pts)
static int
DemuxVideo(demux_t *demux, mtime_t step_length, mtime_t end_pts)
{
struct demux_sys *sys = demux->p_sys;
struct demux_sys *sys = (struct demux_sys *)demux->p_sys;
while (sys->video_pts < end_pts)
{
......@@ -633,7 +634,7 @@ DemuxVideo(demux_t *demux, mtime_t step_length, mtime_t end_pts)
static int
Demux(demux_t *demux)
{
struct demux_sys *sys = demux->p_sys;
struct demux_sys *sys = (struct demux_sys *)demux->p_sys;
if (sys->error)
return VLC_DEMUXER_EGENERIC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment