RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

4x10l fix. Vars used by the config layer must be malloc'd (strdup) as they will be freed at exit. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10619 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-15 13:04:37 +00:00
parent 365eb142f6
commit 5a13436db5
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvo/vo_directfb.c
View File

@ -314,7 +314,7 @@ if (verbose) printf("DirectFB: Preinit entered\n");
(directfb_minor_version <= 9) &&
(directfb_micro_version < 7)))
{
if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER"))) fb_dev_name = "/dev/fb0";
if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER"))) fb_dev_name = strdup("/dev/fb0");
DFBCHECK (DirectFBSetOption ("fbdev",fb_dev_name));
}

2
libvo/vo_directfb2.c
View File

@ -297,7 +297,7 @@ static uint32_t preinit(const char *arg)
* (set options)
*/
if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER"))) fb_dev_name = "/dev/fb0";
if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER"))) fb_dev_name = strdup("/dev/fb0");
DFBCHECK (DirectFBSetOption ("fbdev",fb_dev_name));
// uncomment this if you do not wish to create a new vt for DirectFB

7
libvo/vo_fbdev.c
View File

@ -529,7 +529,7 @@ static void fb_mode2fb_vinfo(fb_mode_t *m, struct fb_var_screeninfo *v)
/* command line/config file options */
char *fb_dev_name = NULL;
char *fb_mode_cfgfile = "/etc/fb.modes";
char *fb_mode_cfgfile = NULL;
char *fb_mode_name = NULL;
static fb_mode_t *fb_mode = NULL;
@ -663,7 +663,7 @@ static int fb_preinit(int reset)
return fb_works;
if (!fb_dev_name && !(fb_dev_name = getenv("FRAMEBUFFER")))
fb_dev_name = "/dev/fb0";
fb_dev_name = strdup("/dev/fb0");
mp_msg(MSGT_VO, MSGL_V, "using %s\n", fb_dev_name);
if ((fb_dev_fd = open(fb_dev_name, O_RDWR)) == -1) {
@ -696,6 +696,9 @@ static int fb_preinit(int reset)
}
fb_bpp = vo_dbpp;
}
if (!fb_mode_cfgfile)
fb_mode_cfgfile = strdup("/etc/fb.modes");
fb_preinit_done = 1;
fb_works = 1;