diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-21 19:10:55 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-21 19:10:55 +0000 |
| commit | bd3dccb0482ae74e0f99b638cac98fd5310e9dfe (patch) | |
| tree | 99e0180648ffc18fe55ef10098dc5d4aef5e78b9 /libvo/vo_xmga.c | |
| parent | 7eebecfc9354fe7d861621e0ae635de3775f7f61 (diff) | |
| download | mpv-bd3dccb0482ae74e0f99b638cac98fd5310e9dfe.tar.bz2 mpv-bd3dccb0482ae74e0f99b638cac98fd5310e9dfe.tar.xz | |
*** empty log message ***
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@183 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xmga.c')
| -rw-r--r-- | libvo/vo_xmga.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 316b3146b6..6fc0719ec5 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -47,7 +47,7 @@ LIBVO_EXTERN( xmga ) #include "x11_common.h" -#ifdef SHOW_TIME +#ifdef SHOW_TIME #include "../linux/timer.h" static unsigned int timer=0; static unsigned int timerd=0; @@ -90,8 +90,6 @@ static XSetWindowAttributes xWAttribs; #include "mga_common.c" - - static void mDrawColorKey( void ) { XClearWindow( mDisplay,mWindow ); @@ -145,13 +143,13 @@ static void check_events(void) } static void flip_page(void){ -#ifdef SHOW_TIME +#ifdef SHOW_TIME unsigned int t; t=GetTimer(); printf(" [timer: %08X diff: %6d dd: %6d ] \n",t,t-timer,(t-timer)-timerd); timerd=t-timer; timer=t; -#endif +#endif check_events(); vo_mga_flip_page(); @@ -181,13 +179,13 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ switch(format) { - case IMGFMT_YV12: + case IMGFMT_YV12: mga_vid_config.format=MGA_VID_FORMAT_YV12; - mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2; + mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2; break; case IMGFMT_YUY2: mga_vid_config.format=MGA_VID_FORMAT_YUY2; - mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2; + mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2; break; default: fprintf(stderr,"mga: invalid output format %0X\n",format); return (-1); } @@ -258,7 +256,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV ); XMapWindow( mDisplay,mWindow ); - + set_window(); mga_vid_config.src_width=width; |