diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-09-25 00:44:04 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-09-25 00:44:04 +0000 |
| commit | 856eea768db38b7e6342114ff0020c42f3c95eb6 (patch) | |
| tree | fe387c5f51297887f30ddeae983282f89166d8c7 /src/dxr3/video_out_dxr3.c | |
| parent | 5763391b5e476b6d31264fab76fccd9c8e8047da (diff) | |
| download | xine-lib-856eea768db38b7e6342114ff0020c42f3c95eb6.tar.gz xine-lib-856eea768db38b7e6342114ff0020c42f3c95eb6.tar.bz2 | |
move alphablend to core
CVS patchset: 7745
CVS date: 2005/09/25 00:44:04
Diffstat (limited to 'src/dxr3/video_out_dxr3.c')
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 7 |
1 files changed, 3 insertions, 4 deletions
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); } |