summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authormswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-28 20:49:34 +0000
committermswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-28 20:49:34 +0000
commit6525fd8c57a9c9df9192e4eed593582928fcdbef (patch)
tree2c269eb2b260f2289256e4d8e5672972d1314ec3 /libvo
parentd5108abe6a70e6e9f996f2d47d2dd396a036c0dc (diff)
downloadmpv-6525fd8c57a9c9df9192e4eed593582928fcdbef.tar.bz2
mpv-6525fd8c57a9c9df9192e4eed593582928fcdbef.tar.xz
Added a patch from Anders Rune Jensen to support the latest em8300 CVS changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11531 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_dxr3.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index b403e67f97..8cad38217d 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -6,6 +6,10 @@
*/
/* ChangeLog added 2002-01-10
+ * 2003-11-28:
+ * Added a patch from Anders Rune Jensen to support the latest em8300 CVS
+ * changes.
+ *
* 2003-02-19:
* Yet another patch from Tamas Kohegyi to fix subpic placement.
*
@@ -863,7 +867,6 @@ static uint32_t preinit(const char *arg)
if (!strncmp("prebuf", arg, 6) && !dxr3_prebuf) {
printf("VO: [dxr3] Enabling prebuffering.\n");
dxr3_prebuf = 1;
- fdflags |= O_NONBLOCK;
} else if (!strncmp("sync", arg, 4) && !dxr3_newsync) {
printf("VO: [dxr3] Using new sync engine.\n");
dxr3_newsync = 1;
@@ -951,7 +954,6 @@ static uint32_t preinit(const char *arg)
strcpy(fdv_name, devname);
/* Open the subpicture interface */
- fdflags |= O_NONBLOCK;
sprintf(devname, "/dev/em8300_sp-%d", dxr3_device_num);
fd_spu = open(devname, fdflags);
if (fd_spu < 0) {