[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu10

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 104f0d7f4c11d891ec7702144d26668d74ca2981
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 8 09:02:57 2009 +0200

    don't override the mplayer built-in defaults for the vo module LP: #446040

diff --git a/debian/mplayer.conf b/debian/mplayer.conf
index 9af41e9..82d3630 100644
--- a/debian/mplayer.conf
+++ b/debian/mplayer.conf
@@ -1,7 +1,7 @@
 #
 # MPlayer configuration file
 #
-# Configuration files are read system-wide from /etc/mplayer.conf
+# Configuration files are read system-wide from /etc/mplayer/mplayer.conf
 # and per user from ~/.mplayer/config, where per-user settings override
 # system-wide settings, all of which are overrriden by the command line.
 #
@@ -17,7 +17,7 @@
 ##################
 
 # Specify default video driver (see -vo help for a list).
-vo=vdpau,xv,x11
+# vo=xv,x11
 
 # FBdev driver:
 #

-- 
mplayer packaging