From 5f2a8474aee2a0353a07a6a74a0312f5e5f5ef23 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 20 Mar 2015 00:21:23 +0100
Subject: video: uninline memcpy_pic functions

There's literally no reason why these functions have to be inline (they
might be performance critical, but then the function call overhead isn't
going to matter at all).

Uninline them and move them to mp_image.c. Drop the header file and fix
all uses of it.
---
 video/out/bitmap_packer.c | 2 +-
 video/out/gl_video.c      | 1 -
 video/out/vo_caca.c       | 1 -
 video/out/vo_direct3d.c   | 1 -
 video/out/vo_opengl.c     | 1 -
 video/out/vo_vaapi.c      | 1 -
 video/out/vo_wayland.c    | 1 -
 video/out/vo_xv.c         | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'video/out')

diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index 747693b089..5fdb1f1bd2 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -29,7 +29,7 @@
 #include "bitmap_packer.h"
 #include "common/common.h"
 #include "sub/dec_sub.h"
-#include "video/memcpy_pic.h"
+#include "video/mp_image.h"
 
 #define IS_POWER_OF_2(x) (((x) > 0) && !(((x) - 1) & (x)))
 
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 801a9ac58f..7d92b47223 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -37,7 +37,6 @@
 #include "gl_osd.h"
 #include "filter_kernels.h"
 #include "aspect.h"
-#include "video/memcpy_pic.h"
 #include "bitmap_packer.h"
 #include "dither.h"
 
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index d9e478e055..a6a6cb9506 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -37,7 +37,6 @@
 #include "config.h"
 #include "vo.h"
 #include "video/mp_image.h"
-#include "video/memcpy_pic.h"
 
 #include "input/keycodes.h"
 #include "input/input.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index b6e40e75ec..8f9b10260d 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -35,7 +35,6 @@
 #include "video/csputils.h"
 #include "video/mp_image.h"
 #include "video/img_format.h"
-#include "video/memcpy_pic.h"
 #include "common/msg.h"
 #include "common/common.h"
 #include "w32_common.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 3abd1d3320..0fb4895f99 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -48,7 +48,6 @@
 #include "gl_hwdec.h"
 #include "gl_osd.h"
 #include "filter_kernels.h"
-#include "video/memcpy_pic.h"
 #include "video/hwdec.h"
 #include "gl_video.h"
 #include "gl_lcms.h"
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index 31479ff41b..6422148a0f 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -32,7 +32,6 @@
 #include "config.h"
 #include "common/msg.h"
 #include "video/out/vo.h"
-#include "video/memcpy_pic.h"
 #include "video/mp_image_pool.h"
 #include "sub/osd.h"
 #include "sub/img_convert.h"
diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c
index c179bbe179..5fb4dc60bd 100644
--- a/video/out/vo_wayland.c
+++ b/video/out/vo_wayland.c
@@ -27,7 +27,6 @@
 #include "vo.h"
 #include "video/mp_image.h"
 #include "video/sws_utils.h"
-#include "video/memcpy_pic.h"
 #include "sub/osd.h"
 #include "sub/img_convert.h"
 #include "common/msg.h"
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index 654f657ca3..e74a8a406a 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -51,7 +51,6 @@
 #include "video/mp_image.h"
 #include "video/img_fourcc.h"
 #include "x11_common.h"
-#include "video/memcpy_pic.h"
 #include "sub/osd.h"
 #include "sub/draw_bmp.h"
 #include "video/csputils.h"
-- 
cgit v1.2.3