diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
| commit | 403f01979cef7e03b8322ddb870e3959c8de0f77 (patch) | |
| tree | 0c40e03354069d59379b924ac9deeee0d17b10d8 /src/xine-engine/video_overlay.c | |
| parent | d1010f51a2cb07ba83d71423ab740a5a0c3d0934 (diff) | |
| download | xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.gz xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.bz2 | |
merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
CVS patchset: 2606
CVS date: 2002/09/04 23:31:05
Diffstat (limited to 'src/xine-engine/video_overlay.c')
| -rw-r--r-- | src/xine-engine/video_overlay.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index aa752ba51..11a520917 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2000-2001 the xine project + * Copyright (C) 2000-2002 the xine project * - * This file is part of xine, a unix video player. + * This file is part of xine, a free video player. * * xine is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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_overlay.c,v 1.23 2002/09/01 05:52:15 jcdutton Exp $ + * $Id: video_overlay.c,v 1.24 2002/09/04 23:31:13 guenter Exp $ * */ @@ -29,7 +29,6 @@ #include <fcntl.h> #include "buffer.h" -#include "events.h" #include "xine_internal.h" #include "video_out/alphablend.h" #include "xine-engine/bswap.h" @@ -548,8 +547,8 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) { /* This is called from video_out.c * must call output->overlay_blend for each active overlay. */ -static void video_overlay_multiple_overlay_blend(video_overlay_instance_t *this_gen, int64_t vpts, - vo_driver_t *output, vo_frame_t *vo_img, int enabled) { +static void video_overlay_multiple_overlay_blend (video_overlay_instance_t *this_gen, int64_t vpts, + xine_vo_driver_t *output, vo_frame_t *vo_img, int enabled) { video_overlay_t *this = (video_overlay_t *) this_gen; int i; int32_t handle; |