diff options
| author | wm4 <wm4@nowhere> | 2014-07-05 16:54:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:15 +0200 |
| commit | 8d40b1e8ab2eeefae7a3bc20e176b2be707d3682 (patch) | |
| tree | 358317c2fec590018ac473a58795ae3ca7f13a9f /player | |
| parent | 7e209185f1fa804dda4474de7246a4d85418315e (diff) | |
| download | mpv-8d40b1e8ab2eeefae7a3bc20e176b2be707d3682.tar.bz2 mpv-8d40b1e8ab2eeefae7a3bc20e176b2be707d3682.tar.xz | |
demux: make start time a simple field
Simpler, especially for later changes.
Diffstat (limited to 'player')
| -rw-r--r-- | player/misc.c | 2 | ||||
| -rw-r--r-- | player/timeline/tl_mpv_edl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/player/misc.c b/player/misc.c index 1e22e4e097..abaf5b208a 100644 --- a/player/misc.c +++ b/player/misc.c @@ -116,7 +116,7 @@ double get_start_time(struct MPContext *mpctx) // timestamp it finds as start PTS. if (mpctx->nav_state) return 0; - return demuxer_get_start_time(demuxer); + return demuxer->start_time; } float mp_get_cache_percent(struct MPContext *mpctx) diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c index 78fc8b7cdc..69cd4e97ce 100644 --- a/player/timeline/tl_mpv_edl.c +++ b/player/timeline/tl_mpv_edl.c @@ -203,7 +203,7 @@ static void resolve_timestamps(struct tl_part *part, struct demuxer *demuxer) part->length = length; } if (!part->offset_set) - part->offset = demuxer_get_start_time(demuxer); + part->offset = demuxer->start_time; } static void build_timeline(struct MPContext *mpctx, struct tl_parts *parts) @@ -223,7 +223,7 @@ static void build_timeline(struct MPContext *mpctx, struct tl_parts *parts) double len = source_get_length(source); if (len > 0) { - len += demuxer_get_start_time(source); + len += source->start_time; } else { MP_WARN(mpctx, "EDL: source file '%s' has unknown duration.\n", part->filename); |