summaryrefslogtreecommitdiffstats
path: root/core/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-06 21:41:21 +0100
committerwm4 <wm4@nowhere>2013-02-06 23:03:39 +0100
commitc5340512dd5a75079779c896505a038caf3ce69a (patch)
treedad034fa95de5d1c9f835cf8e1fe5ec0f4592518 /core/input
parent74817a77d45c96d4107b1946d0f918a893c58cac (diff)
downloadmpv-c5340512dd5a75079779c896505a038caf3ce69a.tar.bz2
mpv-c5340512dd5a75079779c896505a038caf3ce69a.tar.xz
core: remove --edlout functionality
This could write .edl files in MPlayer's format. Support for playing these files has been removed from mplayer2 quite a while ago. (mplayer2 can play its own, "new" .edl format, but does not support writing it.) Since this is a rather obscure functionality, and it's not really clear how it should behave (e.g. what should it do if a new file is played), and wasn't all that great to begin with (what if you made a mistake? the "edl_mark" command sucks for editing), get rid of it. Suggestions how to reimplement this in a nicer way are welcome. If it's just about retrieving timecodes, this in input.conf will do: KEY print_text "position: ${=time-pos}"
Diffstat (limited to 'core/input')
-rw-r--r--core/input/input.c1
-rw-r--r--core/input/input.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/input/input.c b/core/input/input.c
index a03acd8e76..7e94dbe453 100644
--- a/core/input/input.c
+++ b/core/input/input.c
@@ -123,7 +123,6 @@ static const mp_cmd_t mp_cmds[] = {
{"exact", 1}, {"1", 1},
{"keyframes", -1}, {"-1", -1})),
}},
- { MP_CMD_EDL_MARK, "edl_mark", },
{ MP_CMD_SPEED_MULT, "speed_mult", { ARG_FLOAT } },
{ MP_CMD_QUIT, "quit", { OARG_INT(0) } },
{ MP_CMD_STOP, "stop", },
diff --git a/core/input/input.h b/core/input/input.h
index 86726719b1..974ca3d6c4 100644
--- a/core/input/input.h
+++ b/core/input/input.h
@@ -40,7 +40,6 @@ enum mp_command_type {
MP_CMD_PLAYLIST_CLEAR,
MP_CMD_SUB_STEP,
MP_CMD_TV_SET_CHANNEL,
- MP_CMD_EDL_MARK,
MP_CMD_TV_LAST_CHANNEL,
MP_CMD_TV_SET_FREQ,
MP_CMD_TV_SET_NORM,