summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-11 20:36:23 +0100
committerwm4 <wm4@nowhere>2016-01-11 20:36:23 +0100
commit8135838018e0f0822dbec540c427508c44f92fc1 (patch)
treeb32f42ef855a7daf75b70bb24c6822386f9bf14a /player/core.h
parentf54ae2031e8d914783c023dc0491c0a5c62a622d (diff)
downloadmpv-8135838018e0f0822dbec540c427508c44f92fc1.tar.bz2
mpv-8135838018e0f0822dbec540c427508c44f92fc1.tar.xz
player: eliminate demux_get_next_pts()
This slightly changes behavior when seeking with external audio/subtitle tracks if transport streams and mpeg files are played, as well as behavior when seeking with such external tracks. get_main_demux_pts() is evil because it always blocks on the demuxer (if there isn't already a packet queued). Thus it could lock up the player, which is a shame because all other possible causes have been removed. The reduced "precision" when seeking in the ts/mpeg cases (where SEEK_FACTOR is used, resulting in byte seeks instead of timestamp seeks) might lead to issues. We should probably drop this heuristic. (It was introduced because there is no other way to seek in files with PTS resets with libavformat, but its value is still questionable.)
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/player/core.h b/player/core.h
index fe87658d81..7098b3bd46 100644
--- a/player/core.h
+++ b/player/core.h
@@ -449,7 +449,6 @@ void mp_print_version(struct mp_log *log, int always);
void wakeup_playloop(void *ctx);
// misc.c
-double get_main_demux_pts(struct MPContext *mpctx);
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);