[Mplayer-cvslog] CVS: main/etc input.conf,1.3,1.4

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/etc
In directory mplayer:/var/tmp.root/cvs-serv29264/etc

Modified Files:
	input.conf 
Log Message:
sync


Index: input.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/input.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- input.conf	10 Mar 2002 08:02:33 -0000	1.3
+++ input.conf	15 Mar 2002 22:27:09 -0000	1.4
@@ -33,7 +33,6 @@
 / volume -1
 0 volume 1
 * volume 1
-m use_master
 1 contrast -1
 2 contrast 1
 3 brightness -1
@@ -45,6 +44,7 @@
 d frame_drop
 r sub_pos -1
 t sub_pos +1
+f vo_fullscreen
 
 h tv_step_channel 1
 l tv_step_channel -1
@@ -52,6 +52,18 @@
 b tv_step_chanlist
 
 ##
+## GUI
+##
+
+#l gui_loadfile
+#t gui_loadsubtitle
+#a gui_about
+#s gui_stop
+#p gui_playlist
+#r gui_preferences
+#c gui_skinbrowser
+
+##
 ## Joystick section
 ## WARNING: joystick support has to be explicitly enabled at
 ##          compiletime with --enable-joystick
@@ -65,4 +77,3 @@
 JOY_BTN1 osd
 JOY_BTN2 volume 1"},
 JOY_BTN3 volume -1"},
-f vo_fullscreen