diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-01 14:52:15 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-01 14:52:15 +0000 |
| commit | a011baa532a11a0f4327325e55a831047d2947bb (patch) | |
| tree | 4450d050cf2a3913acdf6586501fe4103300a2f7 /libvo | |
| parent | 7dee0c9d8d10f0184ce2262bebf54cbc62fd8482 (diff) | |
| download | mpv-a011baa532a11a0f4327325e55a831047d2947bb.tar.bz2 mpv-a011baa532a11a0f4327325e55a831047d2947bb.tar.xz | |
keepaspect and nokeepaspect are now useable by all vos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12372 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 1 | ||||
| -rw-r--r-- | libvo/video_out.h | 1 | ||||
| -rw-r--r-- | libvo/x11_common.c | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index d4ed70ce68..6f7dec839d 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -43,6 +43,7 @@ float vo_panscan = 0.0f; int vo_ontop = 0; int vo_adapter_num=0; int vo_refresh_rate=0; +int vo_keepaspect=1; int vo_pts=0; // for hw decoding float vo_fps=0; // for mp1e rte diff --git a/libvo/video_out.h b/libvo/video_out.h index 3f5dbc9124..7d83b2c97f 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -198,6 +198,7 @@ extern int vo_fsmode; extern float vo_panscan; extern int vo_adapter_num; extern int vo_refresh_rate; +extern int vo_keepaspect; extern int vo_gamma_brightness; extern int vo_gamma_saturation; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c667bf7b8f..e70cebf185 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -103,8 +103,6 @@ static int vo_old_y = 0; static int vo_old_width = 0; static int vo_old_height = 0; -int vo_x11_keepaspect = 1; - #ifdef HAVE_XINERAMA int xinerama_screen = 0; int xinerama_x = 0; @@ -825,7 +823,7 @@ int vo_x11_check_events(Display *mydisplay){ void vo_x11_sizehint( int x, int y, int width, int height, int max ) { vo_hint.flags=PPosition | PSize | PWinGravity; - if(vo_x11_keepaspect) + if(vo_keepaspect) { vo_hint.flags |= PAspect; vo_hint.min_aspect.x = width; |