move alphablend to core

CVS patchset: 7745
CVS date: 2005/09/25 00:44:04

5 files changed, 4 insertions, 10 deletions

diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 4fbe6b306..b93cb3a62 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -37,7 +37,6 @@ endif
 xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_dxr3_la_SOURCES = \
-	alphablend.c \
 	dxr3_mpeg_encoders.c \
 	dxr3_spu_encoder.c \
 	dxr3_scr.c \
@@ -48,7 +47,6 @@ xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = \
 	em8300.h \
-	alphablend.h \
 	dxr3.h \
 	dxr3_scr.h \
 	video_out_dxr3.h
diff --git a/src/dxr3/alphablend.c b/src/dxr3/alphablend.c
deleted file mode 100644
index 39949ab51..000000000
--- a/src/dxr3/alphablend.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../video_out/alphablend.c"
diff --git a/src/dxr3/alphablend.h b/src/dxr3/alphablend.h
deleted file mode 100644
index 86dec99d4..000000000
--- a/src/dxr3/alphablend.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../video_out/alphablend.h"
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 3d2cf960a..676722f14 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_dxr3.c,v 1.110 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_dxr3.c,v 1.111 2005/09/25 00:44:04 miguelfreitas Exp $
  */
  
 /* mpeg1 encoding video out plugin for the dxr3.  
@@ -65,7 +65,6 @@
 #include "xine_internal.h"
 #include "xineutils.h"
 #include "video_out.h"
-#include "alphablend.h"
 #include "dxr3.h"
 #include "video_out_dxr3.h"
 
@@ -819,11 +818,11 @@ static void dxr3_overlay_blend(vo_driver_t *this_gen, vo_frame_t *frame_gen,
     
     if (overlay->rle) {
       if (frame_gen->format == XINE_IMGFMT_YV12)
-        blend_yuv(frame->vo_frame.base, overlay,
+        _x_blend_yuv(frame->vo_frame.base, overlay,
                   frame->vo_frame.width, frame->vo_frame.height,
                   frame->vo_frame.pitches, &this->alphablend_extra_data);
       else
-        blend_yuy2(frame->vo_frame.base[0], overlay,
+        _x_blend_yuy2(frame->vo_frame.base[0], overlay,
                    frame->vo_frame.width, frame->vo_frame.height,
                    frame->vo_frame.pitches[0], &this->alphablend_extra_data);
     }
diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h
index 00494445d..8a5e9a8e6 100644
--- a/src/dxr3/video_out_dxr3.h
+++ b/src/dxr3/video_out_dxr3.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_dxr3.h,v 1.24 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out_dxr3.h,v 1.25 2005/09/25 00:44:04 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,7 +32,6 @@
 #include "vo_scale.h"
 #include "dxr3_scr.h"
 #include "dxr3.h"
-#include "alphablend.h"
 
 /* the number of supported encoders */
 #define SUPPORTED_ENCODER_COUNT 3