mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
Move setting of frame_buffer variable out of 'if', as preferred by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28015 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5351098826
commit
472e68dace
@ -933,8 +933,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
@ -214,8 +214,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user