diff options
author | wm4 <wm4@nowhere> | 2016-02-20 16:22:15 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-02-20 16:22:15 +0100 |
commit | 297fdcc0955f70ff03bbd07a6d23550159a41b62 (patch) | |
tree | baf93cc25e48b6b04cdc4e428dd06f772127aadd /demux/demux.c | |
parent | d549c4e402fbcebbab52ad00d90642bbca67963c (diff) | |
download | mpv-297fdcc0955f70ff03bbd07a6d23550159a41b62.tar.bz2 mpv-297fdcc0955f70ff03bbd07a6d23550159a41b62.tar.xz |
demux_timeline: fix nested timelines
You can e.g. reference ordered chapters or other EDL files in EDLs.
There were some bugs left which broke this in some cases.
Diffstat (limited to 'demux/demux.c')
-rw-r--r-- | demux/demux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c index 61becd7f04..6388ca3732 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -698,6 +698,9 @@ static struct demux_packet *dequeue_packet(struct demux_stream *ds) pkt->pts = MP_ADD_PTS(pkt->pts, ds->in->ts_offset); pkt->dts = MP_ADD_PTS(pkt->dts, ds->in->ts_offset); + pkt->start = MP_ADD_PTS(pkt->start, ds->in->ts_offset); + pkt->end = MP_ADD_PTS(pkt->end, ds->in->ts_offset); + return pkt; } |