[MPlayer-cvslog] CVS: main/input input.c, 1.139, 1.140 input.h, 1.62, 1.63

[Uoti Urpala CVS]

CVS change done by Uoti Urpala CVS

Update of /cvsroot/mplayer/main/input
In directory mail:/var2/tmp/cvs-serv23710/input

Modified Files:
	input.c input.h 
Log Message:
Make EDL compilation unconditional


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- input.c	23 Apr 2006 14:48:15 -0000	1.139
+++ input.c	27 Apr 2006 12:40:29 -0000	1.140
@@ -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 @@
   { { '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" },

Index: input.h
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- input.h	23 Apr 2006 14:31:54 -0000	1.62
+++ input.h	27 Apr 2006 12:40:29 -0000	1.63
@@ -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