Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv5929/libvo Modified Files: vo_dxr3.c Log Message: Fixed a strange bug that sneaked in at the last minute (vobsub would segfault for some reason.. I don't even know what vobsub is) Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- vo_dxr3.c 16 Feb 2002 12:51:33 -0000 1.55 +++ vo_dxr3.c 16 Feb 2002 13:06:45 -0000 1.56 @@ -429,17 +429,15 @@ int fdflags = O_WRONLY; /* Open the control interface */ - if (!strcmp("noprebuf", vo_subdevice)) { + if (arg && !strcmp("noprebuf", arg)) { printf("VO: [dxr3] Disabling prebuffering.\n"); noprebuf = 1; fdflags |= O_NONBLOCK; - free(vo_subdevice); - vo_subdevice = NULL; } - if (vo_subdevice) { - printf("VO: [dxr3] Forcing use of device %s\n", vo_subdevice); - sprintf(devname, "/dev/em8300-%s", vo_subdevice); + if (arg && !noprebuf) { + printf("VO: [dxr3] Forcing use of device %s\n", arg); + sprintf(devname, "/dev/em8300-%s", arg); } else { /* Try new naming scheme by default */ sprintf(devname, "/dev/em8300-0"); @@ -457,8 +455,8 @@ } /* Open the video interface */ - if (vo_subdevice) { - sprintf(devname, "/dev/em8300_mv-%s", vo_subdevice); + if (arg && !noprebuf) { + sprintf(devname, "/dev/em8300_mv-%s", arg); } else { /* Try new naming scheme by default */ sprintf(devname, "/dev/em8300_mv-0"); @@ -480,8 +478,8 @@ strcpy(fdv_name, devname); /* Open the subpicture interface */ - if (vo_subdevice) { - sprintf(devname, "/dev/em8300_sp-%s", vo_subdevice); + if (arg && !noprebuf) { + sprintf(devname, "/dev/em8300_sp-%s", arg); } else { /* Try new naming scheme by default */ sprintf(devname, "/dev/em8300_sp-0");