diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-03 19:01:03 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-03 19:01:03 +0000 |
| commit | 15b8c965b501465dfeddf7361861e980f11acb19 (patch) | |
| tree | bfa60028aa8fa671be1032a226ced57155bddc17 /src | |
| parent | 15029f2439781c5da7ffcdf18e39ea8ea92b17e9 (diff) | |
| parent | 7dcb309c14e356571452986aece22ddffa8a3cf2 (diff) | |
| download | xine-lib-15b8c965b501465dfeddf7361861e980f11acb19.tar.gz xine-lib-15b8c965b501465dfeddf7361861e980f11acb19.tar.bz2 | |
Merge.
Diffstat (limited to 'src')
| -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 3f3000523..ef0e83530 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1480,6 +1480,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); |