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_timeline.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_timeline.c')
| -rw-r--r-- | demux/demux_timeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c index e52d75fa09..07fe4d102a 100644 --- a/demux/demux_timeline.c +++ b/demux/demux_timeline.c @@ -225,7 +225,7 @@ static int d_fill_buffer(struct demuxer *demuxer) } } - pkt->new_segment = vs->new_segment; + pkt->new_segment |= vs->new_segment; vs->new_segment = false; demux_add_packet(vs->sh, pkt); |