summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-26 00:37:34 +0200
committerwm4 <wm4@nowhere>2017-10-26 00:38:20 +0200
commitae8b531207b3206b9ff1ab7d17092899bd67c565 (patch)
treed52f77ba6db0f326f319e0a7b76bf976aff7ee2c
parentc2d4fd0ef43e44c5c8caee13ae486ae05784c3a5 (diff)
downloadmpv-ae8b531207b3206b9ff1ab7d17092899bd67c565.tar.bz2
mpv-ae8b531207b3206b9ff1ab7d17092899bd67c565.tar.xz
demux_timeline: don't use segments for DASH
Recent regression. Crashes because it sets the segmented flag, without actually setting the fields required for segmentation.
-rw-r--r--demux/demux_timeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index 7eb3d07449..288e9f750a 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -274,6 +274,7 @@ static int d_fill_buffer(struct demuxer *demuxer)
goto drop;
if (!p->dash) {
+ pkt->segmented = true;
if (!pkt->codec)
pkt->codec = demux_get_stream(seg->d, pkt->stream)->codec;
if (pkt->start == MP_NOPTS_VALUE || pkt->start < seg->start)
@@ -305,7 +306,6 @@ static int d_fill_buffer(struct demuxer *demuxer)
}
}
- pkt->segmented = true;
demux_add_packet(vs->sh, pkt);
return 1;