diff options
| author | wm4 <wm4@nowhere> | 2013-11-21 15:59:00 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-21 15:59:00 +0100 |
| commit | d585382f0ef9cf6c8e5e481bb2f4f18a30feca59 (patch) | |
| tree | de9724356de557aa09712803613aef45f8f497cd /mpvcore/player/mp_core.h | |
| parent | 287d2e060319f741e394802d3f09c44432945077 (diff) | |
| download | mpv-d585382f0ef9cf6c8e5e481bb2f4f18a30feca59.tar.bz2 mpv-d585382f0ef9cf6c8e5e481bb2f4f18a30feca59.tar.xz | |
timeline: reject mplayer2 EDL files, change EDL header
This was forgotten when the parser for mplayer2 EDL files was removed.
Change the header of the mpv EDL format to include a '#', so a naive
parser could skip the header as comment. (Maybe this is questionable;
on the other hand, if it can be simpler, why not.)
Also, strip the header in demux_edl.c before passing on the data, so the
header check doesn't need to be duplicated in tl_mpv_edl.c.
Diffstat (limited to 'mpvcore/player/mp_core.h')
| -rw-r--r-- | mpvcore/player/mp_core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h index 2ea65f54be..4e15f49c49 100644 --- a/mpvcore/player/mp_core.h +++ b/mpvcore/player/mp_core.h @@ -428,8 +428,6 @@ void update_subtitles(struct MPContext *mpctx); void build_ordered_chapter_timeline(struct MPContext *mpctx); // timeline/tl_mpv_edl.c void build_mpv_edl_timeline(struct MPContext *mpctx); -// timeline/tl_edl.c -void build_edl_timeline(struct MPContext *mpctx); // timeline/tl_cue.c void build_cue_timeline(struct MPContext *mpctx); |