From def735bdc89224f575593b264029b53245401f3f Mon Sep 17 00:00:00 2001
From: gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 11 Apr 2001 10:10:12 +0000
Subject: *** empty log message ***

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@346 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/codecs.conf  |  9 ++++++++-
 DOCS/example.conf | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 77eeb9ee22..1fcb607689 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -235,6 +235,13 @@ videocodec wmv8
 ;  out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec m261
+  info "M261"
+  status untested
+  fourcc m261,M261
+  dll "msh261.drv"
+  out BGR32,BGR24,BGR15
+
 audiocodec divx
   info "DivX audio (WMA)"
   status working
@@ -318,7 +325,7 @@ audiocodec ac3
 
 audiocodec voxware
   info "VoxWare"
-  status working
+  status working	; audio is bubbling
   format 0x75
   driver dshow
   dll "voxmsdec.ax"
diff --git a/DOCS/example.conf b/DOCS/example.conf
index 70a2b67526..1de1be9a75 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -11,7 +11,15 @@
 vo=xv				# To specify your default video output
 				# see -vo help for available options
 
-fs=yes				# Fullscreen playing will be default
+fs=yes				# Do fullscreen playing by default
+				# Used by all drivers
+
+vm=yes				# Use XF86VidMode extension where appropriate
+				# (video mode changing, not scaling)
+				# Used by drivers: dga, x11
+
+zoom=yes			# Use hardware/software scaling
+				# Used by drivers: ?
 
 ##
 ## Multiple languages are available :)
@@ -43,7 +51,7 @@ alsa = nem
 ffactor = 0.75
 
 ##
-## You can also include another configfiles
+## You can also include other configfiles
 ## Specify full path!
 ##
 
-- 
cgit v1.2.3