From f074ce7eb5183ef850969d28c78c5c4bd61e0fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Date: Fri, 19 Nov 2004 08:56:30 +0000 Subject: Fixed segfault occuring in the xxmc plugin when it had swithed to accelerated decoding while software surfaces were still in the frame queue and sometimes needed to be duplicated. Cleaned up xxmc shape / colorkey X11OSD handling. Fixed more locking inconsistensies. CVS patchset: 7137 CVS date: 2004/11/19 08:56:30 --- src/video_out/xxmc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/video_out/xxmc.h') diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 234cd2fdb..bf1bddebf 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -18,7 +18,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: xxmc.h,v 1.4 2004/10/30 15:12:49 totte67 Exp $ + * $Id: xxmc.h,v 1.5 2004/11/19 08:56:30 totte67 Exp $ * * video_out_xxmc.c, X11 decoding accelerated video extension interface for xine * @@ -205,6 +205,8 @@ struct xxmc_driver_s { xxmc_frame_t *recent_frames[VO_NUM_RECENT_FRAMES]; xxmc_frame_t *cur_frame; x11osd *xoverlay; + int xv_xoverlay_type; + int xoverlay_type; int ovl_changed; /* all scaling information goes here */ @@ -244,11 +246,10 @@ struct xxmc_driver_s { unsigned xvmc_mpeg; unsigned xvmc_accel; unsigned last_accel_request; - unsigned fallback_used; unsigned xvmc_width; unsigned xvmc_height; int have_xvmc_autopaint; - int xoverlay_ck; + int xvmc_xoverlay_type; int unsigned_intra; /* -- cgit v1.2.3