diff options
| author | mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-16 13:06:45 +0000 |
|---|---|---|
| committer | mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-16 13:06:45 +0000 |
| commit | 6292bf2273f9c9d58b364f78a5ebf19e4036e0b1 (patch) | |
| tree | a10ae6e7dd88159a5f111c3b06a7f8c8e75e8538 /libvo/vo_dxr3.c | |
| parent | 49ab796720532c885a01da713ac872a647d94f34 (diff) | |
| download | mpv-6292bf2273f9c9d58b364f78a5ebf19e4036e0b1.tar.bz2 mpv-6292bf2273f9c9d58b364f78a5ebf19e4036e0b1.tar.xz | |
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)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4725 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_dxr3.c')
| -rw-r--r-- | libvo/vo_dxr3.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 2f2729f5ef..67893f5e83 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -429,17 +429,15 @@ static uint32_t preinit(const char *arg) 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 @@ static uint32_t preinit(const char *arg) } /* 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 @@ static uint32_t preinit(const char *arg) 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"); |