summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEduard Hasenleithner <ehasenle@users.sourceforge.net>2001-08-17 16:00:02 +0000
committerEduard Hasenleithner <ehasenle@users.sourceforge.net>2001-08-17 16:00:02 +0000
commite48313f4507bd8c37b31ac0ccd7fe74128c7b6ed (patch)
tree9258021cd10880052a44879e7f453edc5191c722 /src
parent3e145ff72fe7554f0dc9f4054653bf5462879981 (diff)
downloadxine-lib-e48313f4507bd8c37b31ac0ccd7fe74128c7b6ed.tar.gz
xine-lib-e48313f4507bd8c37b31ac0ccd7fe74128c7b6ed.tar.bz2
Overlay has new data member rle
CVS patchset: 445 CVS date: 2001/08/17 16:00:02
Diffstat (limited to 'src')
-rw-r--r--src/video_out/video_out_xshm.c4
-rw-r--r--src/video_out/video_out_xv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 743cdc15c..a0ff2a9cc 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.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_xshm.c,v 1.24 2001/07/24 13:20:02 guenter Exp $
+ * $Id: video_out_xshm.c,v 1.25 2001/08/17 16:00:02 ehasenle Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -697,7 +697,7 @@ static void xshm_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo
xshm_frame_t *frame = (xshm_frame_t *) frame_gen;
/* Alpha Blend here */
- if (overlay->data) {
+ if (overlay->rle) {
switch(this->bpp) {
case 16:
blend_rgb16( frame->image->data, overlay, frame->rgb_width, frame->rgb_height);
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index aebcd6730..9b789a545 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.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_xv.c,v 1.56 2001/07/25 23:26:14 richwareham Exp $
+ * $Id: video_out_xv.c,v 1.57 2001/08/17 16:00:02 ehasenle Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -547,7 +547,7 @@ static void xv_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_o
* As XV drivers improve to support Hardware overlay, we will change this function.
*/
- if (overlay->data) {
+ if (overlay->rle) {
blend_yuv( frame->image->data, overlay, frame->width, frame->height);
}
}