From 61617ec7c0413cc74059ca6df91d38f6e1933502 Mon Sep 17 00:00:00 2001
From: gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 15 Mar 2002 22:27:09 +0000
Subject: [PATCH] sync

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5114 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/input.conf | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/etc/input.conf b/etc/input.conf
index ca5288acb4..70340775cf 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -33,7 +33,6 @@ x sub_delay +0.1
 / volume -1
 0 volume 1
 * volume 1
-m use_master
 1 contrast -1
 2 contrast 1
 3 brightness -1
@@ -45,12 +44,25 @@ m use_master
 d frame_drop
 r sub_pos -1
 t sub_pos +1
+f vo_fullscreen
 
 h tv_step_channel 1
 l tv_step_channel -1
 n tv_step_norm
 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
@@ -65,4 +77,3 @@ JOY_BTN0 pause
 JOY_BTN1 osd
 JOY_BTN2 volume 1"},
 JOY_BTN3 volume -1"},
-f vo_fullscreen