diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /libvo/vo_xvmc.c | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'libvo/vo_xvmc.c')
| -rw-r--r-- | libvo/vo_xvmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 709967fb41..4e42fe4128 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -529,7 +529,7 @@ int vm = flags & VOFLAG_MODESWITCHING; surface_render[i].data_blocks = data_blocks.blocks; surface_render[i].mv_blocks = mv_blocks.macro_blocks; surface_render[i].allocated_mv_blocks = numblocks; - surface_render[i].allocated_data_blocks = numblocks*blocks_per_macroblock;; + surface_render[i].allocated_data_blocks = numblocks*blocks_per_macroblock; surface_render[i].idct = (surface_info.mc_type & XVMC_IDCT) == XVMC_IDCT; surface_render[i].unsigned_intra = (surface_info.flags & XVMC_INTRA_UNSIGNED) == XVMC_INTRA_UNSIGNED; surface_render[i].p_surface = &surface_array[i]; @@ -943,7 +943,7 @@ int i; if(p_render_surface == NULL) return; - calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL); + calc_src_dst_rects(image_width, image_height, &src_rect, &dst_rect, NULL, NULL); if(draw_ck) vo_xv_draw_colorkey(dst_rect.left, dst_rect.top, dst_rect.width, dst_rect.height); |