summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-25 02:32:24 +0100
committerwm4 <wm4@nowhere>2014-03-25 02:32:24 +0100
commitd2e4938c78014f182e0dce0458cb2a45d2f3c418 (patch)
treed41d7250b38daa93ebe1fb929c24b0a7ef3f0353 /player/core.h
parent6c2cd08afffa6d4fe5c16144b0c883f6997d0399 (diff)
downloadmpv-d2e4938c78014f182e0dce0458cb2a45d2f3c418.tar.bz2
mpv-d2e4938c78014f182e0dce0458cb2a45d2f3c418.tar.xz
player: use MP_NOPTS_VALUE as rel_time_to_abs() error value
And consistently use MP_NOPTS_VALUE as error value for the users of this function. This is better than using -1, especially because negative values can be valid timestamps.
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/player/core.h b/player/core.h
index bda0309f9d..55c526b4cc 100644
--- a/player/core.h
+++ b/player/core.h
@@ -411,8 +411,7 @@ void mp_print_version(struct mp_log *log, int always);
// misc.c
double get_start_time(struct MPContext *mpctx);
double get_main_demux_pts(struct MPContext *mpctx);
-double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t,
- double fallback_time);
+double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t);
double get_play_end_pts(struct MPContext *mpctx);
double get_relative_time(struct MPContext *mpctx);
void merge_playlist_files(struct playlist *pl);