Mercurial > mplayer.hg

changeset 27981:53912f852a86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move setting of frame_buffer variable out of 'if', as preferred by Reimar.
author diego
date Mon, 24 Nov 2008 08:40:11 +0000
parents 21779d5ea61c
children b6be6109babd
files libvo/vo_fbdev.c libvo/vo_wii.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Mon Nov 24 08:31:44 2008 +0000
+++ b/libvo/vo_fbdev.c	Mon Nov 24 08:40:11 2008 +0000
@@ -933,8 +933,10 @@
     {
         int x_offset = 0, y_offset = 0;
         geometry(&x_offset, &y_offset, &out_width, &out_height, fb_xres, fb_yres);
-        if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
-                                             MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
+
+        frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
+                                        MAP_SHARED, fb_dev_fd, 0);
+        if (frame_buffer == (uint8_t *) -1) {
         mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
         return 1;
         }
--- a/libvo/vo_wii.c	Mon Nov 24 08:31:44 2008 +0000
+++ b/libvo/vo_wii.c	Mon Nov 24 08:40:11 2008 +0000
@@ -214,8 +214,10 @@
   fb_line_len = fb_finfo.line_length;
   fb_size     = fb_finfo.smem_len;
   frame_buffer = NULL;
-  if ((frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
-                                       MAP_SHARED, fb_dev_fd, 0)) == (uint8_t *) -1) {
+
+  frame_buffer = (uint8_t *) mmap(0, fb_size, PROT_READ | PROT_WRITE,
+                                  MAP_SHARED, fb_dev_fd, 0);
+  if (frame_buffer == (uint8_t *) -1) {
     mp_msg(MSGT_VO, MSGL_ERR, "Can't mmap %s: %s\n", fb_dev_name, strerror(errno));
     return 1;
   }