diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:26:05 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-05 19:26:05 +0000 |
| commit | 054a7a1300887eaa7c799d50248b68b57c7376b1 (patch) | |
| tree | 150dd6dcbbbb9b5f6f2712aa93a4a493433791d1 /src/video_out/video_out_opengl.c | |
| parent | 52f388580cc4bd1261003785206c64585565b5b8 (diff) | |
| parent | ebbd60ff7043826886cd7c35fde9e06bfe3b5093 (diff) | |
| download | xine-lib-054a7a1300887eaa7c799d50248b68b57c7376b1.tar.gz xine-lib-054a7a1300887eaa7c799d50248b68b57c7376b1.tar.bz2 | |
Merge from 1.1.
--HG--
branch : 1.2.1-branch
Diffstat (limited to 'src/video_out/video_out_opengl.c')
| -rw-r--r-- | src/video_out/video_out_opengl.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index d00a916e1..570afa2fd 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1482,6 +1482,20 @@ static void opengl_overlay_blend (vo_driver_t *this_gen, XUnlockDisplay (this->display); } } else { + + if (!frame->rgb_dst) { + if (frame->format == XINE_IMGFMT_YV12) { + _x_blend_yuv(frame->vo_frame.base, overlay, + frame->width, frame->height, frame->vo_frame.pitches, + &this->alphablend_extra_data); + } else { + _x_blend_yuy2(frame->vo_frame.base[0], overlay, + frame->width, frame->height, frame->vo_frame.pitches[0], + &this->alphablend_extra_data); + } + return; + } + if (!overlay->rgb_clut || !overlay->hili_rgb_clut) opengl_overlay_clut_yuv2rgb (this, overlay, frame); |