diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2001-10-09 09:50:22 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2001-10-09 09:50:22 +0000 |
| commit | 641d2f4ba232ebfc9d7d7b2ba70eb34e951bd51b (patch) | |
| tree | a9d0dd817f0d5de56a687454f62a6bdd612d7ae8 /src/video_out/video_out_xshm.c | |
| parent | c4ef31142425708cd43d8d02709fc2536b889277 (diff) | |
| download | xine-lib-641d2f4ba232ebfc9d7d7b2ba70eb34e951bd51b.tar.gz xine-lib-641d2f4ba232ebfc9d7d7b2ba70eb34e951bd51b.tar.bz2 | |
blend_rgb* with rle-image scaling. Used by the XShm video_out driver.
This fixes the position and size for button hilights using the dvdnav plugin
and position and size of subtitles.
CVS patchset: 773
CVS date: 2001/10/09 09:50:22
Diffstat (limited to 'src/video_out/video_out_xshm.c')
| -rw-r--r-- | src/video_out/video_out_xshm.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 4bc337406..56aa1c4a0 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.41 2001/10/03 15:14:03 jkeil Exp $ + * $Id: video_out_xshm.c,v 1.42 2001/10/09 09:50:22 jkeil Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -717,13 +717,19 @@ static void xshm_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo if (overlay->rle) { switch(this->bpp) { case 16: - blend_rgb16( (uint8_t *)frame->image->data, overlay, frame->rgb_width, frame->rgb_height); + blend_rgb16( (uint8_t *)frame->image->data, overlay, + frame->rgb_width, frame->rgb_height, + this->delivered_width, this->delivered_height); break; case 24: - blend_rgb24( (uint8_t *)frame->image->data, overlay, frame->rgb_width, frame->rgb_height); + blend_rgb24( (uint8_t *)frame->image->data, overlay, + frame->rgb_width, frame->rgb_height, + this->delivered_width, this->delivered_height); break; case 32: - blend_rgb32( (uint8_t *)frame->image->data, overlay, frame->rgb_width, frame->rgb_height); + blend_rgb32( (uint8_t *)frame->image->data, overlay, + frame->rgb_width, frame->rgb_height, + this->delivered_width, this->delivered_height); break; default: /* It should never get here */ |