diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 12:40:29 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 12:40:29 +0000 |
commit | 8f30963c37732395940f6435b014f5cf45d52434 (patch) | |
tree | 5519de8aed6939047056c93f9ed5bce432c46f57 /input | |
parent | 9706c6b61611dba9e2addb5388ed56617ed7d231 (diff) | |
download | mpv-8f30963c37732395940f6435b014f5cf45d52434.tar.bz2 mpv-8f30963c37732395940f6435b014f5cf45d52434.tar.xz |
Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 4 | ||||
-rw-r--r-- | input/input.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/input/input.c b/input/input.c index 3e98055024..eb25eb0af3 100644 --- a/input/input.c +++ b/input/input.c @@ -48,9 +48,7 @@ static mp_cmd_t mp_cmds[] = { { MP_CMD_SEEK, "seek", 1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, -#ifdef USE_EDL { MP_CMD_EDL_MARK, "edl_mark", 0, { {-1,{0}} } }, -#endif { MP_CMD_AUDIO_DELAY, "audio_delay", 1, { {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_SPEED_INCR, "speed_incr", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, { MP_CMD_SPEED_MULT, "speed_mult", 1, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, @@ -356,9 +354,7 @@ static mp_cmd_bind_t def_cmd_binds[] = { { { 'j', 0 }, "vobsub_lang" }, { { 'F', 0 }, "forced_subs_only" }, { { '#', 0 }, "switch_audio" }, -#ifdef USE_EDL { { 'i', 0 }, "edl_mark" }, -#endif #ifdef USE_TV { { 'h', 0 }, "tv_step_channel 1" }, { { 'k', 0 }, "tv_step_channel -1" }, diff --git a/input/input.h b/input/input.h index 4bc61041fe..5fe9a88121 100644 --- a/input/input.h +++ b/input/input.h @@ -37,9 +37,7 @@ #define MP_CMD_GET_PERCENT_POS 35 #define MP_CMD_SUB_STEP 36 #define MP_CMD_TV_SET_CHANNEL 37 -#ifdef USE_EDL #define MP_CMD_EDL_MARK 38 -#endif #define MP_CMD_SUB_ALIGNMENT 39 #define MP_CMD_TV_LAST_CHANNEL 40 #define MP_CMD_OSD_SHOW_TEXT 41 |