Attachment #126603 for bug #187382

Lines 19-24 Link Here

(-)libvo/aspect.c (-1 / +4 lines)
19		19
20	#include "video_out.h"	20	#include "video_out.h"
21		21
		22	float force_monitor_aspect=0;
22	float monitor_aspect=0;	23	float monitor_aspect=0;
23	float monitor_pixel_aspect=1;	24	float monitor_pixel_aspect=1;
24	extern float movie_aspect;	25	extern float movie_aspect;
Lines 55-61 Link Here
55	#endif	56	#endif
56	aspdat.scrw = scrw;	57	aspdat.scrw = scrw;
57	aspdat.scrh = scrh;	58	aspdat.scrh = scrh;
58	if (!monitor_aspect)	59	if (force_monitor_aspect)
		60	monitor_aspect = force_monitor_aspect;
		61	else
59	monitor_aspect = monitor_pixel_aspect * scrw / scrh;	62	monitor_aspect = monitor_pixel_aspect * scrw / scrh;
60	}	63	}

Lines 99-105 Link Here

(-)cfg-mplayer.h (-2 / +2 lines)
99	#endif	99	#endif
100		100
101	/* from libvo/aspect.c */	101	/* from libvo/aspect.c */
102	extern float monitor_aspect;	102	extern float force_monitor_aspect;
103	extern float monitor_pixel_aspect;	103	extern float monitor_pixel_aspect;
104		104
105	extern int sws_flags;	105	extern int sws_flags;
Lines 213-219 Link Here
213	// Geometry string	213	// Geometry string
214	{"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},	214	{"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
215	// set aspect ratio of monitor - useful for 16:9 TVout	215	// set aspect ratio of monitor - useful for 16:9 TVout
216	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},	216	{"monitoraspect", &force_monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},
217	{"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL},	217	{"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL},
218	// video mode switching: (x11,xv,dga)	218	// video mode switching: (x11,xv,dga)
219	{"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},	219	{"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},




            vo_old_y = vo_dy;
            vo_old_width = vo_dwidth;
            vo_old_height = vo_dheight;
        }
            update_xinerama_info();
            x = xinerama_x;
            y = xinerama_y;
            w = vo_screenwidth;
            h = vo_screenheight;
        }
    }
    {
        long dummy;

Return to bug 187382

Lines 1533-1544 Link Here

(-)libvo/x11_common.c (-1 / +1 lines)
1533	vo_old_y = vo_dy;	1533	vo_old_y = vo_dy;
1534	vo_old_width = vo_dwidth;	1534	vo_old_width = vo_dwidth;
1535	vo_old_height = vo_dheight;	1535	vo_old_height = vo_dheight;
		1536	}
1536	update_xinerama_info();	1537	update_xinerama_info();
1537	x = xinerama_x;	1538	x = xinerama_x;
1538	y = xinerama_y;	1539	y = xinerama_y;
1539	w = vo_screenwidth;	1540	w = vo_screenwidth;
1540	h = vo_screenheight;	1541	h = vo_screenheight;
1541	}
1542	}	1542	}
1543	{	1543	{
1544	long dummy;	1544	long dummy;