From 297fdcc0955f70ff03bbd07a6d23550159a41b62 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 20 Feb 2016 16:22:15 +0100
Subject: 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.
---
 demux/demux.c          | 3 +++
 demux/demux_timeline.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'demux')

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;
 }
 
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);
-- 
cgit v1.2.3