initial import

[patches.git] / MPlayer-mmap-fall-back-map-private.patch

Index: libvo/vo_fbdev.c
===================================================================
--- libvo/vo_fbdev.c	(revision 22100)
+++ libvo/vo_fbdev.c	(working copy)
@@ -1003,10 +1003,13 @@ static int config(uint32_t width, uint32
 #endif
 	{
 	    int x_offset=0,y_offset=0;
-	    if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
-				    MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
-		mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
-		return 1;
+	    frame_buffer = mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0);
+	    if (frame_buffer == MAP_FAILED) {
+		frame_buffer = mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fb_dev_fd, 0);
+		if (frame_buffer == MAP_FAILED) {
+		    mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
+		    return 1;
+		}
 	    }
 
 	    center = frame_buffer +
Index: libvo/vo_fbdev2.c
===================================================================
--- libvo/vo_fbdev2.c	(revision 22088)
+++ libvo/vo_fbdev2.c	(working copy)
@@ -274,9 +274,13 @@ static int config(uint32_t width, uint32
 
 		fb_size = fb_finfo.smem_len;
 		fb_line_len = fb_finfo.line_length;
-		if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
-			mp_msg(MSGT_VO, MSGL_ERR, "[fbdev2] Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
-			return 1;
+		frame_buffer = mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_SHARED, fb_dev_fd, 0);
+		if (frame_buffer == MAP_FAILED) {
+			frame_buffer = mmap(0, fb_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fb_dev_fd, 0);
+			if (frame_buffer == MAP_FAILED) {
+				mp_msg(MSGT_VO, MSGL_ERR, "[fbdev2] Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
+				return 1;
+			}
 		}
 	}