diff options
Diffstat (limited to 'src/video_out/video_out_xv.c')
| -rw-r--r-- | src/video_out/video_out_xv.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 154cf2381..795476484 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.51 2001/07/09 16:13:11 guenter Exp $ + * $Id: video_out_xv.c,v 1.52 2001/07/10 19:33:05 guenter Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -539,15 +539,18 @@ static void xv_calc_format (xv_driver_t *this, /* * */ -static void xv_overlay_blend (vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void xv_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { xv_frame_t *frame = (xv_frame_t *) frame_gen; -// Alpha Blend here -// As XV drivers improve to support Hardware overlay, we will change this function. + /* Alpha Blend here + * As XV drivers improve to support Hardware overlay, we will change this function. + */ + if (overlay->data) { blend_yuv( frame->image->data, overlay, frame->width, frame->height); } + } /* @@ -609,13 +612,6 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { } } -/* Stores an overlay in the Video Out driver */ -static void xv_set_overlay (vo_driver_t *this_gen, vo_overlay_t *overlay) { - xv_driver_t *this = (xv_driver_t *) this_gen; - - this->overlay = overlay; -} - static int xv_get_property (vo_driver_t *this_gen, int property) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -896,7 +892,6 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->vo_driver.update_frame_format = xv_update_frame_format; this->vo_driver.overlay_blend = xv_overlay_blend; this->vo_driver.display_frame = xv_display_frame; - this->vo_driver.set_overlay = xv_set_overlay; this->vo_driver.get_property = xv_get_property; this->vo_driver.set_property = xv_set_property; this->vo_driver.get_property_min_max = xv_get_property_min_max; |