summaryrefslogtreecommitdiffstats
path: root/video/out/vo_direct3d.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-22 21:46:22 +0100
committerwm4 <wm4@nowhere>2013-01-13 20:04:11 +0100
commit0c5311f17cb9078f0ddde7c41cad61d00aea4a94 (patch)
treee8254feab42d21e0c6932ce68a34228529247f66 /video/out/vo_direct3d.c
parent15c7f7a33968edebe305e2845b32eb2383457d46 (diff)
downloadmpv-0c5311f17cb9078f0ddde7c41cad61d00aea4a94.tar.bz2
mpv-0c5311f17cb9078f0ddde7c41cad61d00aea4a94.tar.xz
video: cleanup: replace old mp_image function names
mp_image_alloc() also changes argument order compared to alloc_mpi(). The format now comes first, then width/height.
Diffstat (limited to 'video/out/vo_direct3d.c')
-rw-r--r--video/out/vo_direct3d.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index d3c907f944..51caaf2be9 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -1616,7 +1616,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi)
if (!get_video_buffer(priv, &buffer))
return;
- copy_mpi(&buffer, mpi);
+ mp_image_copy(&buffer, mpi);
d3d_unlock_video_objects(priv);
@@ -1697,7 +1697,7 @@ static mp_image_t *get_window_screenshot(d3d_priv *priv)
if (width < 1 || height < 1)
goto error_exit;
- image = alloc_mpi(width, height, IMGFMT_BGR32);
+ image = mp_image_alloc(IMGFMT_BGR32, width, height);
IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0);
@@ -1712,7 +1712,7 @@ static mp_image_t *get_window_screenshot(d3d_priv *priv)
error_exit:
if (image)
- free_mp_image(image);
+ talloc_free(image);
if (surface)
IDirect3DSurface9_Release(surface);
return NULL;