[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.14,1.15 vo_mga.c,1.14,1.15 vo_xmga.c,1.25,1.26

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv2534

Modified Files:
	mga_common.c vo_mga.c vo_xmga.c 
Log Message:
fixed mga uninit

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mga_common.c	21 Apr 2001 21:06:37 -0000	1.14
+++ mga_common.c	22 Aug 2001 21:34:27 -0000	1.15
@@ -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);
+}

Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_mga.c	13 Aug 2001 11:08:18 -0000	1.14
+++ vo_mga.c	22 Aug 2001 21:34:27 -0000	1.15
@@ -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)

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vo_xmga.c	13 Aug 2001 11:08:18 -0000	1.25
+++ vo_xmga.c	22 Aug 2001 21:34:27 -0000	1.26
@@ -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");
 }