diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /libvo/vo_dxr3.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'libvo/vo_dxr3.c')
| -rw-r--r-- | libvo/vo_dxr3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index b824f8b71e..2a366bf49e 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -596,9 +596,7 @@ static void draw_osd(void) */ /* Subpics are not stable yet =( expect lockups if you enable */ -#if 1 write(fd_spu, spued->data, spued->count); -#endif } disposd++; #endif |