Mercurial > mplayer.hg

changeset 1637:248972c26eee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed mga uninit
author arpi
date Wed, 22 Aug 2001 21:34:27 +0000
parents 3c33deb3e561
children 671802bf867b
files libvo/mga_common.c libvo/vo_mga.c libvo/vo_xmga.c
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/mga_common.c	Wed Aug 22 21:34:10 2001 +0000
+++ b/libvo/mga_common.c	Wed Aug 22 21:34:27 2001 +0000
@@ -211,3 +211,8 @@
 
 }
 
+static int mga_uninit(){
+	ioctl( f,MGA_VID_OFF,0 );
+	munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
+	close(f);
+}
--- a/libvo/vo_mga.c	Wed Aug 22 21:34:10 2001 +0000
+++ b/libvo/vo_mga.c	Wed Aug 22 21:34:27 2001 +0000
@@ -109,8 +109,8 @@
 static void
 uninit(void)
 {
- ioctl( f,MGA_VID_OFF,0 );
-printf("vo: uninit!\n");
+ mga_uninit();
+ printf("vo: uninit!\n");
 }
 
 static void draw_osd(void)
--- a/libvo/vo_xmga.c	Wed Aug 22 21:34:10 2001 +0000
+++ b/libvo/vo_xmga.c	Wed Aug 22 21:34:27 2001 +0000
@@ -196,6 +196,7 @@
 	f = open(devname,O_RDWR);
 	if(f == -1)
 	{
+		perror("open");
 		printf("Couldn't open %s\n",devname); 
 		return(-1);
 	}
@@ -339,6 +340,6 @@
 uninit(void)
 {
  saver_on(mDisplay);
- ioctl( f,MGA_VID_OFF,0 );
-printf("vo: uninit!\n");
+ mga_uninit();
+ printf("vo: uninit!\n");
 }