diff options
author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-12 17:55:03 +0000 |
---|---|---|
committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-12 17:55:03 +0000 |
commit | ad68b36313eea0fe7f5670f597db6b99c9b1cd14 (patch) | |
tree | efa525b89c70d9bde1923177a8dc402b5a4431cf /libvo/vo_x11.c | |
parent | 379a660afd59d47eb3e4a31534b8dda1a52db26a (diff) | |
download | mpv-ad68b36313eea0fe7f5670f597db6b99c9b1cd14.tar.bz2 mpv-ad68b36313eea0fe7f5670f597db6b99c9b1cd14.tar.xz |
default is allways nozoom again (specify -zoom if u want the sane behavior)
call freeSwsContext() on uninit()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4678 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r-- | libvo/vo_x11.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 27ebd0ee4d..1a8c943868 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -266,7 +266,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t if( flags&0x02 ) vm = 1; if( flags&0x08 ) Flip_Flag = 1; zoomFlag = flags&0x04; - if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode +// if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); @@ -278,8 +278,8 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t /* set image size, if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here */ - image_width=d_width; - image_height=d_height; + image_width=width; + image_height=height; aspect= ((1<<16)*d_width + d_height/2)/d_height; @@ -565,6 +565,8 @@ uninit(void) #endif vo_x11_uninit(mDisplay, mywindow); + + freeSwsContext(swsContext); } static uint32_t preinit(const char *arg) |