Merge branch 'edl'

* edl:
  core: support timeline with audio-only files
  core: wake up a bit less often for audio-only files
  core: audio: cut audio writes at end of timeline part
  EDL: add support for new EDL file format
  stream.[ch], ass_mp: new stream function for whole-file reads
  tl_matroska.c: move the find_files() function here
  bstr.[ch], path.[ch]: add string and path handling functions
  core: ordered chapters: move timeline creation to timeline/
  options: drop support for numeric -demuxer values
  cleanup: demuxer.[ch]: remove unused code, make functions static
  cleanup: reindent demuxer.h, use struct names for types

1 files changed, 6 insertions, 0 deletions

diff --git a/mp_core.h b/mp_core.h
index 825718f161..bbb93bce48 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -251,4 +251,10 @@ char *chapter_display_name(struct MPContext *mpctx, int chapter);
 void update_subtitles(struct MPContext *mpctx, double refpts,
                       double sub_offset, bool reset);
 
+
+// timeline/tl_matroska.c
+void build_ordered_chapter_timeline(struct MPContext *mpctx);
+// timeline/tl_edl.c
+void build_edl_timeline(struct MPContext *mpctx);
+
 #endif /* MPLAYER_MP_CORE_H */