mirror of https://github.com/mpv-player/mpv
Check if we can open /dev/mem in preinit(), so we can exit cleanly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8792 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
3d394abb92
commit
e3bce499be
|
@ -28,6 +28,7 @@
|
|||
#include <pwd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
|
||||
#include "video_out.h"
|
||||
|
@ -1009,6 +1010,7 @@ static void check_events(void)
|
|||
static uint32_t preinit(const char *arg)
|
||||
{
|
||||
int pre_init_err = 0;
|
||||
int fd;
|
||||
if(verbose>1) printf("vo_vesa: preinit(%s) was called\n",arg);
|
||||
if(verbose > 2)
|
||||
printf("vo_vesa: subdevice %s is being initialized\n",arg);
|
||||
|
@ -1018,6 +1020,11 @@ static uint32_t preinit(const char *arg)
|
|||
#ifdef CONFIG_VIDIX
|
||||
else if(vidix_name) pre_init_err = vidix_preinit(vidix_name,&video_out_vesa);
|
||||
#endif
|
||||
// check if we can open /dev/mem (it will be opened later in config(), but if we
|
||||
// detect now that we can't we can exit cleanly)
|
||||
fd = open("/dev/mem", O_RDWR);
|
||||
if (fd < 0)
|
||||
return -1;
|
||||
if(verbose > 2)
|
||||
printf("vo_subdevice: initialization returns: %i\n",pre_init_err);
|
||||
return pre_init_err;
|
||||
|
|
Loading…
Reference in New Issue