diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2004-11-25 03:29:11 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2004-11-25 03:29:11 +0000 |
| commit | b1f794babbe223ac5bc8c0b35220d61f5ea84bda (patch) | |
| tree | 9e013f3f6d7311e5930ef56b95e9f62d58d938f6 | |
| parent | bfafd78c12ec798ed8b40fb835908f5312951e19 (diff) | |
| download | xine-lib-b1f794babbe223ac5bc8c0b35220d61f5ea84bda.tar.gz xine-lib-b1f794babbe223ac5bc8c0b35220d61f5ea84bda.tar.bz2 | |
Fix compile error in overlay blending. (Reinhard Nissl)
CVS patchset: 7162
CVS date: 2004/11/25 03:29:11
| -rw-r--r-- | src/video_out/video_out_opengl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 8b3f11e18..4f7dfae3a 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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_opengl.c,v 1.43 2004/11/24 16:11:04 mroi Exp $ + * $Id: video_out_opengl.c,v 1.44 2004/11/25 03:29:11 dsalt Exp $ * * video_out_opengl.c, OpenGL based interface for xine * @@ -951,12 +951,12 @@ static void opengl_overlay_blend (vo_driver_t *this_gen, opengl_overlay_clut_yuv2rgb (this, overlay, frame); # if BYTES_PER_PIXEL == 3 - blend_rgb24 ((uint8_t *)frame->texture, overlay, + blend_rgb24 ((uint8_t *)frame->rgb, overlay, frame->width, frame->height, frame->width, frame->height, &this->alphablend_extra_data); # elif BYTES_PER_PIXEL == 4 - blend_rgb32 ((uint8_t *)frame->texture, overlay, + blend_rgb32 ((uint8_t *)frame->rgb, overlay, frame->width, frame->height, frame->width, frame->height, &this->alphablend_extra_data); |