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 | |
| 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')
| -rw-r--r-- | libvo/mga_common.c | 2 | ||||
| -rw-r--r-- | libvo/vo_dxr3.c | 2 | ||||
| -rw-r--r-- | libvo/vo_xvmc.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 9a173b3ded..dc00e295ce 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -143,11 +143,9 @@ vo_mga_flip_page(void) // printf("-- flip to %d --\n",mga_next_frame); -#if 1 ioctl(f,MGA_VID_FSEL,&mga_next_frame); mga_next_frame=(mga_next_frame+1)%mga_vid_config.num_frames; vid_data=frames[mga_next_frame]; -#endif } 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 diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index ac832d91d3..2294e6dea1 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -1104,7 +1104,6 @@ static int draw_slice(uint8_t *image[], int stride[], rndr->flags, rndr->filled_mv_blocks_num,rndr->start_mv_blocks_num, &mv_blocks,&data_blocks); -#if 1 if(rez != Success) { int i; @@ -1130,7 +1129,6 @@ static int draw_slice(uint8_t *image[], int stride[], testblock->PMV[0][0][0],testblock->PMV[0][0][1]); } } -#endif assert(rez==Success); mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: flush surface\n"); rez = XvMCFlushSurface(mDisplay, rndr->p_surface); |