From 128bc6a21e3306b8e8346aba439a3c4e2dcbcdc5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 1 Sep 2012 20:02:15 +0200
Subject: Remove VESA/FBDEV remains, clean up example.conf

Remove VESA and FBDEV specific code that was forgotten when the
respective VOs were removed. Remove references to old or broken
stuff from example.conf.
---
 etc/example.conf | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

(limited to 'etc')

diff --git a/etc/example.conf b/etc/example.conf
index ab58551102..588ec00b7e 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -22,29 +22,8 @@
 # Specify default video driver (see -vo help for a list).
 #vo=xv
 
-# Use SDL video with the aalib subdriver by default.
-#vo = sdl:aalib
-
-# FBdev driver:
-#
-# mode to use (read from fb.modes)
-#fbmode = 640x480-120
-#
-# location of the fb.modes file
-#fbmodeconfig = /etc/fb.modes
-
-# Specify your monitor timings for the vesa and fbdev video output drivers.
-# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
-# that exceed the capabilities of your monitor, you may damage it.
-#
-# horizontal frequency range (k stands for 1000)
-#monitor-hfreq = 31.5k-50k,70k
-#
-# vertical frequency range
-#monitor-vfreq = 50-90
-#
-# dotclock (or pixelclock) range (m stands for 1000000)
-#monitor-dotclock = 30M-300M
+# Use OpenGL video by default
+#vo = gl
 
 # Start in fullscreen mode by default.
 #fs=yes
@@ -74,10 +53,7 @@
 ##################
 
 # Specify default audio driver (see -ao help for a list).
-#ao=oss
-
-# Use SDL audio driver with the esd subdriver by default.
-#ao = sdl:esd
+#ao=alsa
 
 # Specify the mixer device.
 #mixer = /dev/mixer
@@ -85,10 +61,6 @@
 # Resample the sound to 44100Hz with the lavcresample audio filter.
 #af=lavcresample=44100
 
-# Output audio to S/PDIF
-#ao=alsa:device=spdif
-#ac=hwac3,hwdts,hwmpa,
-
 
 ##################
 # other settings #
@@ -117,10 +89,6 @@
 # Drop frames to preserve audio/video sync.
 #framedrop = yes
 
-# Specify your preferred skin here (skins are searched for in
-# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
-#skin = Abyss
-
 # Resample the font alphamap.
 # 0     plain white fonts
 # 0.75  very narrow black outline (default)
@@ -153,11 +121,6 @@
 # The options declared as part of profiles override global default settings,
 # but only take effect when the profile is active.
 
-[protocol.dvdnav]
-#vc=ffmpeg12,
-#mouse-movements=yes
-#nocache=yes
-
 #[vo.vdpau]
 #vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
 # Most video filters do not work with vdpau.
-- 
cgit v1.2.3