summaryrefslogtreecommitdiffstats
path: root/demux/demux_edl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-19 22:26:35 +0100
committerwm4 <wm4@nowhere>2013-11-19 22:39:04 +0100
commit04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4 (patch)
tree583e217b7f1b678e8911fcc897529ff8d6faeec2 /demux/demux_edl.c
parent50837129b231ae9a811abac2767af5fa6ced621b (diff)
downloadmpv-04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4.tar.bz2
mpv-04bdd7af72aa9ab5aa81e38ca85d3f40e76f16d4.tar.xz
timeline: add edl:// URIs
Questionable change from user perspective, but internally needed to implement the next commit. Also useful for testing timeline stuff.
Diffstat (limited to 'demux/demux_edl.c')
-rw-r--r--demux/demux_edl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index dd6c660f74..62103d67d2 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -34,6 +34,10 @@ static bool test_header(struct stream *s, char *header)
static int try_open_file(struct demuxer *demuxer, enum demux_check check)
{
struct stream *s = demuxer->stream;
+ if (s->uncached_type == STREAMTYPE_EDL) {
+ demuxer->file_contents = bstr0(s->url);
+ return 0;
+ }
if (check >= DEMUX_CHECK_UNSAFE) {
if (!test_header(s, "mplayer EDL file") &&
!test_header(s, "mpv EDL v0\n"))