Mercurial > mplayer.hg
changeset 23136:7753555efb15
Make -monitorpixelaspect 1 the default.
Patch by Onur K«ä«®«äk <onur.--.-.delipenguen.net>
| author | cehoyos |
|---|---|
| date | Fri, 27 Apr 2007 23:16:45 +0000 |
| parents | 960434b7d963 |
| children | 3d960fd0d3d3 |
| files | DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 cfg-mplayer.h libvo/aspect.c |
| diffstat | 4 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/de/mplayer.1 Fri Apr 27 16:10:45 2007 +0000 +++ b/DOCS/man/de/mplayer.1 Fri Apr 27 23:16:45 2007 +0000 @@ -2991,6 +2991,8 @@ .TP .B \-monitoraspect <Verhältnis> (siehe auch \-aspect) Gibt das Höhen-/\:Breitenverhältnis deines Monitors oder Fernsehers an. +Der Wert 0 schaltet frühere Einstellungen (z.B. in der config Datei) aus. +Überschreibt bei Verwendung die Einstellung von \-monitorpixelaspect. .sp 1 .I BEISPIEL: .PD 0 @@ -3005,9 +3007,7 @@ .B \-monitorpixelaspect <ratio> (siehe auch \-aspect) Setze den Aspekt eines einzelnen Pixels deines Monitors oder TV-Schirms (Standard: deaktiviert). -Überschreibt die Einstellung \-monitoraspect. -Ein Wert von 0 deaktiviert, Wert von 1 bedeutet quadratische Pixel (korrekt -für (fast?) alle LCDs). +Ein Wert von 1 bedeutet quadratische Pixel (korrekt für (fast?) alle LCDs). . .TP .B \-nodouble
--- a/DOCS/man/en/mplayer.1 Fri Apr 27 16:10:45 2007 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Apr 27 23:16:45 2007 +0000 @@ -2880,6 +2880,8 @@ .TP .B \-monitoraspect <ratio> (also see \-aspect) Set the aspect ratio of your monitor or TV screen. +A value of 0 disables previous monitoraspect setting (e.g. in config file). +Overrides the \-monitorpixelaspect setting if enabled. .sp 1 .I EXAMPLE: .PD 0 @@ -2893,8 +2895,7 @@ .TP .B \-monitorpixelaspect <ratio> (also see \-aspect) Set the aspect of a single pixel of your monitor or TV screen (default: disabled). -Overrides the \-monitoraspect setting. -A value of 0 disables, a value of 1 means square pixels +A value of 1 means square pixels (correct for (almost?) all LCDs). . .TP
--- a/cfg-mplayer.h Fri Apr 27 16:10:45 2007 +0000 +++ b/cfg-mplayer.h Fri Apr 27 23:16:45 2007 +0000 @@ -206,8 +206,8 @@ // 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},
--- a/libvo/aspect.c Fri Apr 27 16:10:45 2007 +0000 +++ b/libvo/aspect.c Fri Apr 27 23:16:45 2007 +0000 @@ -19,8 +19,8 @@ #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 @@ #endif aspdat.scrw = scrw; aspdat.scrh = scrh; - if (monitor_pixel_aspect) + if (!monitor_aspect) monitor_aspect = monitor_pixel_aspect * scrw / scrh; }