[MPlayer-cvslog] r23154 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/aspect.c

[cehoyos]

Author: cehoyos
Date: Sat Apr 28 01:16:45 2007
New Revision: 23154

Log:
Make -monitorpixelaspect 0 the default.
Patch by Onur Küçük <onur.--.-.delipenguen.net>


Modified:
   trunk/cfg-mplayer.h
   trunk/libvo/aspect.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/de/mplayer.1
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	(original)
+++ trunk/cfg-mplayer.h	Sat Apr 28 01:16:45 2007
@@ -206,8 +206,8 @@ m_option_t mplayer_opts[]={
 	// Geometry string
 	{"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	// set aspect ratio of monitor - useful for 16:9 TVout
-	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL},
-	{"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},
+	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},
+	{"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL},
 	// video mode switching: (x11,xv,dga)
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL},

Modified: trunk/libvo/aspect.c
==============================================================================
--- trunk/libvo/aspect.c	(original)
+++ trunk/libvo/aspect.c	Sat Apr 28 01:16:45 2007
@@ -19,8 +19,8 @@ float vo_panscanrange = 1.0;
 
 #include "video_out.h"
 
-float monitor_aspect=4.0/3.0;
-float monitor_pixel_aspect=0;
+float monitor_aspect=0;
+float monitor_pixel_aspect=1;
 extern float movie_aspect;
 
 static struct {
@@ -55,7 +55,7 @@ void aspect_save_screenres(int scrw, int
 #endif
   aspdat.scrw = scrw;
   aspdat.scrh = scrh;
-  if (monitor_pixel_aspect)
+  if (!monitor_aspect)
     monitor_aspect = monitor_pixel_aspect * scrw / scrh;
 }