diff options
| author | wm4 <wm4@nowhere> | 2012-12-22 21:46:22 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 20:04:11 +0100 |
| commit | 0c5311f17cb9078f0ddde7c41cad61d00aea4a94 (patch) | |
| tree | e8254feab42d21e0c6932ce68a34228529247f66 /video/out/vo_lavc.c | |
| parent | 15c7f7a33968edebe305e2845b32eb2383457d46 (diff) | |
| download | mpv-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_lavc.c')
| -rw-r--r-- | video/out/vo_lavc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index cdb7f71797..aa9077fb17 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -89,7 +89,7 @@ static void uninit(struct vo *vo) // palette hack if (vc->lastimg->imgfmt == IMGFMT_PAL8) vc->lastimg->planes[1] = NULL; - free_mp_image(vc->lastimg); + talloc_free(vc->lastimg); vc->lastimg = NULL; } @@ -171,7 +171,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, vc->buffer = talloc_size(vc, vc->buffer_size); - vc->lastimg = alloc_mpi(width, height, format); + vc->lastimg = mp_image_alloc(format, width, height); // palette hack if (vc->lastimg->imgfmt == IMGFMT_PAL8) @@ -455,7 +455,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) mp_msg(MSGT_ENCODE, MSGL_INFO, "vo-lavc: Frame at pts %d got displayed %d times\n", (int) vc->lastframeipts, vc->lastdisplaycount); - copy_mpi(vc->lastimg, mpi); + mp_image_copy(vc->lastimg, mpi); vc->lastimg_wants_osd = true; // palette hack |