libvo, libao: remove useless video and audio output drivers

Some of these have only limited use, and some of these have no use at
all. Remove them. They make maintainance harder and nobody needs them.
It's possible that many of the removed drivers were very useful a dozen
of years ago, but now it's 2012.

Note that some of these could be added back, in case they were more
useful than I thought. But right now, they are just a burden.

Reason for removal for each module:
    vo_3dfx, vo_dfbmga, vo_dxr3, vo_ivtv, vo_mga, vo_s3fb,
    vo_tdfxfb, vo_xmga, vo_tdfx_vid:
        All of these are for very specific and outdated hardware. Some
        of them require non-standard kernel drivers or do direct HW
        access.
    vo_dga: the most crappy and ancient way to get fast output on X.
    vo_aa: there's vo_caca for the same purpose.
    vo_ggi: this never lived, and is entirely useless.
    vo_mpegpes: for DVB cards, I can't test this and it's crappy.
    vo_fbdev, vo_fbdev2: there's vo_directfb2
    vo_bl: what is this even? But it's neither important, nor alive.
    vo_svga, vo_vesa: you want to use this? You can't be serious.
    vo_wii: I can't test this, and who the hell uses this?
    vo_xvr100: some Sun thing.
    vo_xover: only useful in connection with xvr100.
    ao_nas: still alive, but I doubt it has any meaning today.
    ao_sun: Sun.
    ao_win32: use ao_dsound or ao_portaudio instead.
    ao_ivtv: removed along vo_ivtv.

Also get rid of anything SDL related. SDL 1.x is total crap for video
output, and will be replaced with SDL 2.x soon (perhaps), so if you
want to use SDL, write output drivers for SDL 2.x.

Additionally, I accidentally damaged Sun support, which made me
completely remove Sun/Solaris support. Nobody cares about this anyway.

Some left overs from previous commits removing modules were cleaned up.

1 files changed, 0 insertions, 1534 deletions

diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
deleted file mode 100644
index 71cf75323a..0000000000
--- a/libvo/vo_sdl.c
+++ /dev/null
@@ -1,1534 +0,0 @@
-/*
- *  vo_sdl.c
- *
- *  (was video_out_sdl.c from OMS project/mpeg2dec -> http://linuxvideo.org)
- *
- *  Copyright (C) Ryan C. Gordon <icculus@lokigames.com> - April 22, 2000
- *
- *  Copyright (C) Felix Buenemann <atmosfear@users.sourceforge.net> - 2001
- *
- *  (for extensive code enhancements)
- *
- *  Current maintainer for MPlayer project (report bugs to that address):
- *    Felix Buenemann <atmosfear@users.sourceforge.net>
- *
- *  This file is a video out driver using the SDL library (http://libsdl.org/),
- *  to be used with MPlayer, further info from http://www.mplayerhq.hu
- *
- *  -- old disclaimer --
- *
- *  A mpeg2dec display driver that does output through the
- *  Simple DirectMedia Layer (SDL) library. This effectively gives us all
- *  sorts of output options: X11, SVGAlib, fbcon, AAlib, GGI. Win32, MacOS
- *  and BeOS support, too. Yay. SDL info, source, and binaries can be found
- *  at http://slouken.devolution.com/SDL/
- *
- *  -- end old disclaimer --
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* define to force software-surface (video surface stored in system memory)*/
-#undef SDL_NOHWSURFACE
-
-/* define to enable surface locks, this might be needed on SMP machines */
-#undef SDL_ENABLE_LOCKS
-
-/* MONITOR_ASPECT MUST BE FLOAT */
-#define MONITOR_ASPECT 4.0/3.0
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "config.h"
-#include "mp_msg.h"
-#include "mp_msg.h"
-#include "video_out.h"
-#include "video_out_internal.h"
-
-#include "fastmemcpy.h"
-#include "sub/sub.h"
-#include "aspect.h"
-#include "libmpcodecs/vfcap.h"
-#include "mpbswap.h"
-
-#ifdef CONFIG_X11
-#include <X11/Xlib.h>
-#include "x11_common.h"
-#endif
-
-#include "subopt-helper.h"
-
-static const vo_info_t info =
-{
-	"SDL YUV/RGB/BGR renderer (SDL v1.1.7+ only!)",
-	"sdl",
-	"Ryan C. Gordon <icculus@lokigames.com>, Felix Buenemann <atmosfear@users.sourceforge.net>",
-	""
-};
-
-const LIBVO_EXTERN(sdl)
-
-#include "sdl_common.h"
-//#include <SDL/SDL_syswm.h>
-
-
-#ifdef SDL_ENABLE_LOCKS
-#define	SDL_OVR_LOCK(x)        if (SDL_LockYUVOverlay (priv->overlay)) { \
- 				mp_msg(MSGT_VO,MSGL_V, "SDL: Couldn't lock YUV overlay\n"); \
-				return x; \
-	    		    }
-#define SDL_OVR_UNLOCK      SDL_UnlockYUVOverlay (priv->overlay);
-
-#define SDL_SRF_LOCK(srf, x)   if(SDL_MUSTLOCK(srf)) { \
-				if(SDL_LockSurface (srf)) { \
- 					mp_msg(MSGT_VO,MSGL_V, "SDL: Couldn't lock RGB surface\n"); \
-					return x; \
-				} \
-			    }
-
-#define SDL_SRF_UNLOCK(srf) if(SDL_MUSTLOCK(srf)) \
-				SDL_UnlockSurface (srf);
-#else
-#define SDL_OVR_LOCK(x)
-#define SDL_OVR_UNLOCK
-#define SDL_SRF_LOCK(srf, x)
-#define SDL_SRF_UNLOCK(srf)
-#endif
-
-/** Private SDL Data structure **/
-
-static struct sdl_priv_s {
-
-	/* output driver used by sdl */
-	char driver[8];
-
-	/* SDL display surface */
-	SDL_Surface *surface;
-
-	/* SDL RGB surface */
-	SDL_Surface *rgbsurface;
-
-	/* SDL YUV overlay */
-	SDL_Overlay *overlay;
-
-	/* available fullscreen modes */
-	SDL_Rect **fullmodes;
-
-	/* surface attributes for fullscreen and windowed mode */
-	Uint32 sdlflags, sdlfullflags;
-
-	/* save the windowed output extents */
-	SDL_Rect windowsize;
-
-	/* Bits per Pixel */
-	Uint8 bpp;
-
-	/* RGB or YUV? */
-	Uint8 mode;
-	#define YUV 0
-	#define RGB 1
-	#define BGR 2
-
-	/* use direct blitting to surface */
-	int dblit;
-
-	/* current fullscreen mode, 0 = highest available fullscreen mode */
-	int fullmode;
-
-	/* YUV ints */
-	int framePlaneY, framePlaneUV, framePlaneYUY;
-	int stridePlaneY, stridePlaneUV, stridePlaneYUY;
-
-	/* RGB ints */
-	int framePlaneRGB;
-	int stridePlaneRGB;
-
-	/* Flip image */
-	int flip;
-
-	/* fullscreen behaviour; see init */
-	int fulltype;
-
-	/* is X running (0/1) */
-	int X;
-
-	/* X11 Resolution */
-	int XWidth, XHeight;
-
-        /* original image dimensions */
-	int width, height;
-
-	/* destination dimensions */
-	int dstwidth, dstheight;
-
-    /* Draw image at coordinate y on the SDL surfaces */
-    int y;
-
-    /* The image is displayed between those y coordinates in priv->surface */
-    int y_screen_top, y_screen_bottom;
-
-    /* 1 if the OSD has changed otherwise 0 */
-    int osd_has_changed;
-
-	/* source image format (YUV/RGB/...) */
-    uint32_t format;
-
-    /* dirty_off_frame[0] contains a bounding box around the osd contents drawn above the image
-       dirty_off_frame[1] is the corresponding thing for OSD contents drawn below the image
-    */
-    SDL_Rect dirty_off_frame[2];
-} sdl_priv;
-
-static void erase_area_4(int x_start, int width, int height, int pitch, uint32_t color, uint8_t* pixels);
-static void erase_area_1(int x_start, int width, int height, int pitch, uint8_t color, uint8_t* pixels);
-static int setup_surfaces(void);
-static void set_video_mode(int width, int height, int bpp, uint32_t sdlflags);
-static void erase_rectangle(int x, int y, int w, int h);
-
-/* Expand 'rect' to contain the rectangle specified by x, y, w and h */
-static void expand_rect(SDL_Rect* rect, int x, int y, int w, int h)
-{
-    if(rect->x < 0 || rect->y < 0) {
-        rect->x = x;
-        rect->y = y;
-        rect->w = w;
-        rect->h = h;
-        return;
-    }
-
-    if(rect->x > x)
-        rect->x = x;
-
-    if(rect->y > y)
-        rect->y = y;
-
-    if(rect->x + rect->w < x + w)
-        rect->w = x + w - rect->x;
-
-    if(rect->y + rect->h < y + h)
-        rect->h = y + h - rect->y;
-}
-
-/** libvo Plugin functions **/
-
-/**
- * draw_alpha is used for osd and subtitle display.
- *
- **/
-
-static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
-	struct sdl_priv_s *priv = &sdl_priv;
-
-    if(priv->osd_has_changed) {
-        /* OSD did change. Store a bounding box of everything drawn into the OSD */
-        if(priv->y >= y0) {
-            /* Make sure we don't mark part of the frame area dirty */
-            if(h + y0 > priv->y)
-                expand_rect(&priv->dirty_off_frame[0], x0, y0, w, priv->y - y0);
-            else
-                expand_rect(&priv->dirty_off_frame[0], x0, y0, w, h);
-        }
-        else if(priv->y + priv->height <= y0 + h) {
-            /* Make sure we don't mark part of the frame area dirty */
-            if(y0 < priv->y + priv->height)
-                expand_rect(&priv->dirty_off_frame[1], x0,
-                            priv->y + priv->height,
-                            w, h - ((priv->y + priv->height) - y0));
-            else
-                expand_rect(&priv->dirty_off_frame[1], x0, y0, w, h);
-        }
-    }
-    else { /* OSD contents didn't change only draw parts that was erased by the frame */
-        if(priv->y >= y0) {
-           src = src + (priv->y - y0) * stride;
-           srca = srca + (priv->y - y0) * stride;
-           h -= priv->y - y0;
-           y0 = priv->y;
-        }
-
-        if(priv->y + priv->height <= y0 + h)
-            h = priv->y + priv->height - y0;
-
-        if(h <= 0)
-            return;
-    }
-
-	switch(priv->format) {
-		case IMGFMT_YV12:
-		case IMGFMT_I420:
-        	case IMGFMT_IYUV:
-            vo_draw_alpha_yv12(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+priv->overlay->pitches[0]*y0+x0,priv->overlay->pitches[0]);
-		break;
-		case IMGFMT_YUY2:
-        	case IMGFMT_YVYU:
-                x0 *= 2;
-    			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+priv->overlay->pitches[0]*y0+x0,priv->overlay->pitches[0]);
-		break;
-        	case IMGFMT_UYVY:
-                x0 *= 2;
-    			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+priv->overlay->pitches[0]*y0+x0,priv->overlay->pitches[0]);
-		break;
-
-		default:
-        if(priv->dblit) {
-            x0 *= priv->surface->format->BytesPerPixel;
-		switch(priv->format) {
-		case IMGFMT_RGB15:
-		case IMGFMT_BGR15:
-    			vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) priv->surface->pixels)+y0*priv->surface->pitch+x0,priv->surface->pitch);
-		break;
-		case IMGFMT_RGB16:
-		case IMGFMT_BGR16:
-    			vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) priv->surface->pixels)+y0*priv->surface->pitch+x0,priv->surface->pitch);
-		break;
-		case IMGFMT_RGB24:
-		case IMGFMT_BGR24:
-    			vo_draw_alpha_rgb24(w,h,src,srca,stride,((uint8_t *) priv->surface->pixels)+y0*priv->surface->pitch+x0,priv->surface->pitch);
-		break;
-		case IMGFMT_RGB32:
-		case IMGFMT_BGR32:
-    			vo_draw_alpha_rgb32(w,h,src,srca,stride,((uint8_t *) priv->surface->pixels)+y0*priv->surface->pitch+x0,priv->surface->pitch);
-		break;
-		}
-        }
-		else {
-            x0 *= priv->rgbsurface->format->BytesPerPixel;
-		switch(priv->format) {
-		case IMGFMT_RGB15:
-		case IMGFMT_BGR15:
-    			vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) priv->rgbsurface->pixels)+y0*priv->rgbsurface->pitch+x0,priv->rgbsurface->pitch);
-		break;
-		case IMGFMT_RGB16:
-		case IMGFMT_BGR16:
-    			vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) priv->rgbsurface->pixels)+y0*priv->rgbsurface->pitch+x0,priv->rgbsurface->pitch);
-		break;
-		case IMGFMT_RGB24:
-		case IMGFMT_BGR24:
-    			vo_draw_alpha_rgb24(w,h,src,srca,stride,((uint8_t *) priv->rgbsurface->pixels)+y0*priv->rgbsurface->pitch+x0,priv->rgbsurface->pitch);
-		break;
-		case IMGFMT_RGB32:
-		case IMGFMT_BGR32:
-    			vo_draw_alpha_rgb32(w,h,src,srca,stride,((uint8_t *) priv->rgbsurface->pixels)+y0*priv->rgbsurface->pitch+x0,priv->rgbsurface->pitch);
-		break;
-		}
-        }
-
-  	}
-}
-
-
-/**
- * Take a null-terminated array of pointers, and find the last element.
- *
- *    params : array == array of which we want to find the last element.
- *   returns : index of last NON-NULL element.
- **/
-
-static inline int findArrayEnd (SDL_Rect **array)
-{
-	int i = 0;
-	while ( array[i++] );	/* keep loopin' ... */
-
-	/* return the index of the last array element */
-	return i - 1;
-}
-
-
-/**
- * Open and prepare SDL output.
- *
- *    params : *plugin ==
- *             *name ==
- *   returns : 0 on success, -1 on failure
- **/
-
-static int sdl_open (void *plugin, void *name)
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-	const SDL_VideoInfo *vidInfo = NULL;
-	/*static int opened = 0;
-
-	if (opened)
-	    return 0;
-	opened = 1;*/
-
-
-	/* other default values */
-	#ifdef SDL_NOHWSURFACE
-		mp_msg(MSGT_VO,MSGL_V, "SDL: using software-surface\n");
-		priv->sdlflags = SDL_SWSURFACE|SDL_RESIZABLE|SDL_ANYFORMAT;
-		priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_ANYFORMAT;
-		// XXX:FIXME: ASYNCBLIT should be enabled for SMP systems
-	#else
-		/*if((strcmp(priv->driver, "dga") == 0) && (priv->mode)) {
-			if( mp_msg_test(MSGT_VO,MSGL_V) ) {
-				printf("SDL: using software-surface\n"); }
-			priv->sdlflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_ASYNCBLIT|SDL_HWACCEL|SDL_ANYFORMAT;
-			priv->sdlfullflags = SDL_SWSURFACE|SDL_FULLSCREEN|SDL_ASYNCBLIT|SDL_HWACCEL|SDL_ANYFORMAT;
-		}
-		else {	*/
-	 		mp_msg(MSGT_VO,MSGL_V, "SDL: using hardware-surface\n");
-			priv->sdlflags = SDL_HWSURFACE|SDL_RESIZABLE/*|SDL_ANYFORMAT*/;
-			priv->sdlfullflags = SDL_HWSURFACE|SDL_FULLSCREEN/*|SDL_ANYFORMAT*/;
-			// XXX:FIXME: ASYNCBLIT should be enabled for SMP systems
-		//}
-	#endif
-
-#if !defined( __AMIGAOS4__ ) && !defined( __APPLE__ )
-	priv->sdlfullflags |= SDL_DOUBLEBUF;
-	if (vo_doublebuffering)
-	    priv->sdlflags |= SDL_DOUBLEBUF;
-#endif
-
-	/* get information about the graphics adapter */
-	vidInfo = SDL_GetVideoInfo ();
-
-	/* collect all fullscreen & hardware modes available */
-	if (!(priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags))) {
-
-		/* non hardware accelerated fullscreen modes */
-		priv->sdlfullflags &= ~SDL_HWSURFACE;
- 		priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags);
-	}
-
-	/* test for normal resizeable & windowed hardware accellerated surfaces */
-	if (!SDL_ListModes (vidInfo->vfmt, priv->sdlflags)) {
-
-		/* test for NON hardware accelerated resizeable surfaces - poor you.
-		 * That's all we have. If this fails there's nothing left.
-		 * Theoretically there could be Fullscreenmodes left - we ignore this for now.
-		 */
-		priv->sdlflags &= ~SDL_HWSURFACE;
-		if ((!SDL_ListModes (vidInfo->vfmt, priv->sdlflags)) && (!priv->fullmodes)) {
-			mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_SDL] Couldn't get any acceptable SDL Mode for output.\n");
-			return -1;
-		}
-	}
-
-
-   /* YUV overlays need at least 16-bit color depth, but the
-    * display might less. The SDL AAlib target says it can only do
-    * 8-bits, for example. So, if the display is less than 16-bits,
-    * we'll force the BPP to 16, and pray that SDL can emulate for us.
-    */
-	priv->bpp = vidInfo->vfmt->BitsPerPixel;
-	if (priv->mode == YUV && priv->bpp < 16) {
-
- 		    mp_msg(MSGT_VO,MSGL_V, "SDL: Your SDL display target wants to be at a color "
-                           "depth of (%d), but we need it to be at least 16 "
-                           "bits, so we need to emulate 16-bit color. This is "
-                           "going to slow things down; you might want to "
-                           "increase your display's color depth, if possible.\n",
-                           priv->bpp);
-
-		priv->bpp = 16;
-	}
-
-	/* Success! */
-	return 0;
-}
-
-
-/**
- * Close SDL, Cleanups, Free Memory
- *
- *    params : *plugin
- *   returns : non-zero on success, zero on error.
- **/
-
-static int sdl_close (void)
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-
-	if (priv->fullmode)
-	    SDL_ShowCursor(1);
-
-	/* Cleanup YUV Overlay structure */
-	if (priv->overlay) {
-		SDL_FreeYUVOverlay(priv->overlay);
-		priv->overlay=NULL;
-	}
-
-	/* Free RGB Surface */
-	if (priv->rgbsurface) {
-		SDL_FreeSurface(priv->rgbsurface);
-		priv->rgbsurface=NULL;
-	}
-
-	/* Free our blitting surface */
-	if (priv->surface) {
-		SDL_FreeSurface(priv->surface);
-		priv->surface=NULL;
-	}
-
-	/* DON'T attempt to free the fullscreen modes array. SDL_Quit* does this for us */
-
-	return 0;
-}
-
-/**
- * Do aspect ratio calculations
- *
- *   params : srcw == sourcewidth
- *            srch == sourceheight
- *            dstw == destinationwidth
- *            dsth == destinationheight
- *
- *  returns : SDL_Rect structure with new x and y, w and h
- **/
-
-#if 0
-static SDL_Rect aspect(int srcw, int srch, int dstw, int dsth) {
-	SDL_Rect newres;
-	mp_msg(MSGT_VO,MSGL_V, "SDL Aspect-Destinationres: %ix%i (x: %i, y: %i)\n", newres.w, newres.h, newres.x, newres.y);
-	newres.h = ((float)dstw / (float)srcw * (float)srch) * ((float)dsth/((float)dstw/(MONITOR_ASPECT)));
-	if(newres.h > dsth) {
-		newres.w = ((float)dsth / (float)newres.h) * dstw;
-		newres.h = dsth;
-		newres.x = (dstw - newres.w) / 2;
-		newres.y = 0;
-	}
-	else {
-		newres.w = dstw;
-		newres.x = 0;
-		newres.y = (dsth - newres.h) / 2;
-	}
-
-	mp_msg(MSGT_VO,MSGL_V, "SDL Mode: %d:  %d x %d\n", i, priv->fullmodes[i]->w, priv->fullmodes[i]->h);
-
-	return newres;
-}
-#endif
-
-/**
- * Sets the specified fullscreen mode.
- *
- *   params : mode == index of the desired fullscreen mode
- *  returns : doesn't return
- **/
-
-#if 0
-static void set_fullmode (int mode)
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-	SDL_Surface *newsurface = NULL;
-	int haspect, waspect = 0;
-
-	/* if we haven't set a fullmode yet, default to the lowest res fullmode first */
-	if (mode < 0)
-		mode = priv->fullmode = findArrayEnd(priv->fullmodes) - 1;
-
-	/* Calculate proper aspect ratio for fullscreen
-	 * Height smaller than expected: add horizontal black bars (haspect)*/
-	haspect = (priv->width * (float) ((float) priv->fullmodes[mode]->h / (float) priv->fullmodes[mode]->w) - priv->height) * (float) ((float) priv->fullmodes[mode]->w / (float) priv->width);
-	/* Height bigger than expected: add vertical black bars (waspect)*/
-	if (haspect < 0) {
-		haspect = 0; /* set haspect to zero because image will be scaled horizontal instead of vertical */
-		waspect = priv->fullmodes[mode]->w - ((float) ((float) priv->fullmodes[mode]->h / (float) priv->height) * (float) priv->width);
-	}
-//	printf ("W-Aspect: %i  H-Aspect: %i\n", waspect, haspect);
-
-	/* change to given fullscreen mode and hide the mouse cursor */
-	newsurface = SDL_SetVideoMode(priv->fullmodes[mode]->w - waspect, priv->fullmodes[mode]->h - haspect, priv->bpp, priv->sdlfullflags);
-
-	/* if we were successful hide the mouse cursor and save the mode */
-	if (newsurface) {
-		if (priv->surface)
-	    	    SDL_FreeSurface(priv->surface);
-		priv->surface = newsurface;
-		SDL_ShowCursor(0);
-	}
-}
-#endif
-
-/* Set video mode. Not fullscreen */
-static void set_video_mode(int width, int height, int bpp, uint32_t sdlflags)
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-    SDL_Surface* newsurface;
-
-    if(priv->rgbsurface)
-	SDL_FreeSurface(priv->rgbsurface);
-    else if(priv->overlay)
-	SDL_FreeYUVOverlay(priv->overlay);
-
-    priv->rgbsurface = NULL;
-    priv->overlay = NULL;
-
-    newsurface = SDL_SetVideoMode(width, height, bpp, sdlflags);
-
-    if(newsurface) {
-
-        /* priv->surface will be NULL the first time this function is called. */
-        if(priv->surface)
-            SDL_FreeSurface(priv->surface);
-
-        priv->surface = newsurface;
-        priv->dstwidth = width;
-        priv->dstheight = height;
-        vo_dwidth  = width;
-        vo_dheight = height;
-
-        setup_surfaces();
-    }
-    else
-        mp_msg(MSGT_VO,MSGL_WARN, "set_video_mode: SDL_SetVideoMode failed: %s\n", SDL_GetError());
-}
-
-static void set_fullmode (int mode) {
-	struct sdl_priv_s *priv = &sdl_priv;
-	SDL_Surface *newsurface = NULL;
- 	int screen_surface_w, screen_surface_h;
-
- 	if(priv->rgbsurface)
-	        SDL_FreeSurface(priv->rgbsurface);
- 	else if(priv->overlay)
-	        SDL_FreeYUVOverlay(priv->overlay);
-
- 	priv->rgbsurface = NULL;
- 	priv->overlay = NULL;
-
-	/* if we haven't set a fullmode yet, default to the lowest res fullmode first */
-	/* But select a mode where the full video enter */
-	if(priv->X && priv->fulltype & VOFLAG_FULLSCREEN) {
-		screen_surface_w = priv->XWidth;
-		screen_surface_h = priv->XHeight;
-	}
-	else if (mode < 0) {
-        int i,j,imax;
-		mode = 0; // Default to the biggest mode avaible
-		if ( mp_msg_test(MSGT_VO,MSGL_V) ) for(i=0;priv->fullmodes[i];++i)
- 	           mp_msg(MSGT_VO,MSGL_V, "SDL Mode: %d:  %d x %d\n", i, priv->fullmodes[i]->w, priv->fullmodes[i]->h);
-		for(i = findArrayEnd(priv->fullmodes) - 1; i >=0; i--) {
-		  if( (priv->fullmodes[i]->w >= priv->dstwidth) &&
-		      (priv->fullmodes[i]->h >= priv->dstheight) ) {
-		      imax = i;
-		      for (j = findArrayEnd(priv->fullmodes) - 1; j >=0; j--) {
-			  if (priv->fullmodes[j]->w > priv->fullmodes[imax]->w
-			      && priv->fullmodes[j]->h == priv->fullmodes[imax]->h)
-			      imax = j;
-		      }
-		      mode = imax;
-		      break;
-		    }
-		  }
-		mp_msg(MSGT_VO,MSGL_V, "SET SDL Mode: %d:  %d x %d\n", mode, priv->fullmodes[mode]->w, priv->fullmodes[mode]->h);
-		priv->fullmode = mode;
-        screen_surface_h = priv->fullmodes[mode]->h;
-        screen_surface_w = priv->fullmodes[mode]->w;
-	}
-    else {
-       screen_surface_h = priv->fullmodes[mode]->h;
-       screen_surface_w = priv->fullmodes[mode]->w;
-	}
-
-	aspect_save_screenres(screen_surface_w, screen_surface_h);
-
-	/* calculate new video size/aspect */
-	if(priv->mode == YUV) {
-        if(priv->fulltype&VOFLAG_FULLSCREEN)
-		aspect_save_screenres(priv->XWidth, priv->XHeight);
-
-        aspect(&priv->dstwidth, &priv->dstheight, A_ZOOM);
-	}
-
-	/* try to change to given fullscreenmode */
-	newsurface = SDL_SetVideoMode(priv->dstwidth, screen_surface_h, priv->bpp,
-                                  priv->sdlfullflags);
-
-	/*
-	 * In Mac OS X (and possibly others?) SDL_SetVideoMode() appears to
-	 * destroy the datastructure previously retrived, so we need to
-	 * re-assign it.  The comment in sdl_close() seems to imply that we
-	 * should not free() anything.
-	 */
-	#ifdef __APPLE__
-	{
-	const SDL_VideoInfo *vidInfo = NULL;
-	vidInfo = SDL_GetVideoInfo ();
-
-	/* collect all fullscreen & hardware modes available */
-	if (!(priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags))) {
-
-	    /* non hardware accelerated fullscreen modes */
-	    priv->sdlfullflags &= ~SDL_HWSURFACE;
-	    priv->fullmodes = SDL_ListModes (vidInfo->vfmt, priv->sdlfullflags);
-	}
-	}
-	#endif
-
-
-
-	/* if creation of new surface was successful, save it and hide mouse cursor */
-	if(newsurface) {
-		if (priv->surface)
-	    	    SDL_FreeSurface(priv->surface);
-		priv->surface = newsurface;
-		SDL_ShowCursor(0);
-        SDL_SRF_LOCK(priv->surface, -1)
-        SDL_FillRect(priv->surface, NULL, 0);
-        SDL_SRF_UNLOCK(priv->surface)
-        setup_surfaces();
-	}
-    else
-        mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SDL] Set_fullmode: SDL_SetVideoMode failed: %s.\n", SDL_GetError());
-}
-
-
-/**
- * Initialize an SDL surface and an SDL YUV overlay.
- *
- *    params : width  == width of video we'll be displaying.
- *             height == height of video we'll be displaying.
- *             fullscreen == want to be fullscreen?
- *             title == Title for window titlebar.
- *   returns : non-zero on success, zero on error.
- **/
-
-static int
-config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
-//static int sdl_setup (int width, int height)
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-
-    switch(format){
-        case IMGFMT_I420:
-            mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SDL] Mapping I420 to IYUV.\n");
-            format = SDL_IYUV_OVERLAY;
-		case IMGFMT_YV12:
-		case IMGFMT_IYUV:
-		case IMGFMT_YUY2:
-		case IMGFMT_UYVY:
-		case IMGFMT_YVYU:
-            priv->mode = YUV;
-            break;
-		case IMGFMT_BGR15:
-		case IMGFMT_BGR16:
-		case IMGFMT_BGR24:
-		case IMGFMT_BGR32:
-			priv->mode = BGR;
-			break;
-        case IMGFMT_RGB15:
-        case IMGFMT_RGB16:
-        case IMGFMT_RGB24:
-		case IMGFMT_RGB32:
-			priv->mode = RGB;
-			break;
-		default:
- 			mp_tmsg(MSGT_VO,MSGL_WARN, "[VO_SDL] Unsupported image format (0x%X).\n",format);
-			return -1;
-	}
-
-    if ( vo_config_count ) sdl_close();
-
-    mp_msg(MSGT_VO,MSGL_V, "SDL: Using 0x%X (%s) image format\n", format, vo_format_name(format));
-
-    if(priv->mode != YUV) {
-		priv->sdlflags |= SDL_ANYFORMAT;
-		priv->sdlfullflags |= SDL_ANYFORMAT;
-	}
-
-    /* SDL can only scale YUV data */
-    if(priv->mode == RGB || priv->mode == BGR) {
-        d_width = width;
-        d_height = height;
-    }
-
-    aspect_save_orig(width,height);
-	aspect_save_prescale(d_width ? d_width : width, d_height ? d_height : height);
-
-	/* Save the original Image size */
-    priv->width  = width;
-    priv->height = height;
-    priv->dstwidth  = d_width ? d_width : width;
-    priv->dstheight = d_height ? d_height : height;
-
-    priv->format = format;
-
-	if (sdl_open(NULL, NULL) != 0)
-	    return -1;
-
-	/* Set output window title */
-	SDL_WM_SetCaption (".: MPlayer : F = Fullscreen/Windowed : C = Cycle Fullscreen Resolutions :.", title);
-	//SDL_WM_SetCaption (title, title);
-
-    if(priv->X) {
-	aspect_save_screenres(priv->XWidth,priv->XHeight);
-	aspect(&priv->dstwidth,&priv->dstheight,A_NOZOOM);
-    }
-
-	priv->windowsize.w = priv->dstwidth;
-  	priv->windowsize.h = priv->dstheight;
-
-	/* bit 0 (0x01) means fullscreen (-fs)
-	 * bit 1 (0x02) means mode switching (-vm)
-	 * bit 2 (0x04) enables software scaling (-zoom)
-	 * bit 3 (0x08) enables flipping (-flip)
-	 */
-//      printf("SDL: flags are set to: %i\n", flags);
-//	printf("SDL: Width: %i Height: %i D_Width %i D_Height: %i\n", width, height, d_width, d_height);
-	if(flags&VOFLAG_FLIPPING) {
-		mp_msg(MSGT_VO,MSGL_V, "SDL: using flipped video (only with RGB/BGR/packed YUV)\n");
-		priv->flip = 1;
-	}
-	if(flags&VOFLAG_FULLSCREEN) {
- 	  	mp_msg(MSGT_VO,MSGL_V, "SDL: setting zoomed fullscreen without modeswitching\n");
- 		    mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SDL] Info - please use -vm or -zoom to switch to the best resolution.\n");
-		priv->fulltype = VOFLAG_FULLSCREEN;
-		set_fullmode(priv->fullmode);
-          	/*if((priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)))
-			SDL_ShowCursor(0);*/
-	} else
-	if(flags&VOFLAG_MODESWITCHING) {
- 	 	mp_msg(MSGT_VO,MSGL_V, "SDL: setting zoomed fullscreen with modeswitching\n");
-		priv->fulltype = VOFLAG_MODESWITCHING;
-		set_fullmode(priv->fullmode);
-          	/*if((priv->surface = SDL_SetVideoMode (d_width ? d_width : width, d_height ? d_height : height, priv->bpp, priv->sdlfullflags)))
-			SDL_ShowCursor(0);*/
-	} else
-	if(flags&VOFLAG_SWSCALE) {
-		mp_msg(MSGT_VO,MSGL_V, "SDL: setting zoomed fullscreen with modeswitching\n");
-		priv->fulltype = VOFLAG_SWSCALE;
-		set_fullmode(priv->fullmode);
-	}
-        else {
-		if((strcmp(priv->driver, "x11") == 0)
-		||(strcmp(priv->driver, "windib") == 0)
-		||(strcmp(priv->driver, "directx") == 0)
-		||(strcmp(priv->driver, "Quartz") == 0)
-		||(strcmp(priv->driver, "cgx") == 0)
-		||(strcmp(priv->driver, "os4video") == 0)
-		||((strcmp(priv->driver, "aalib") == 0) && priv->X)){
- 			mp_msg(MSGT_VO,MSGL_V, "SDL: setting windowed mode\n");
-            set_video_mode(priv->dstwidth, priv->dstheight, priv->bpp, priv->sdlflags);
-		}
-		else {
- 			mp_msg(MSGT_VO,MSGL_V, "SDL: setting zoomed fullscreen with modeswitching\n");
-			priv->fulltype = VOFLAG_SWSCALE;
-			set_fullmode(priv->fullmode);
-		}
-	}
-
-        if(!priv->surface) { // cannot SetVideoMode
- 		mp_tmsg(MSGT_VO,MSGL_WARN, "[VO_SDL] Failed to set video mode: %s.\n", SDL_GetError());
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Free priv->rgbsurface or priv->overlay if they are != NULL.
- * Setup priv->rgbsurface or priv->overlay depending on source format.
- * The size of the created surface or overlay depends on the size of
- * priv->surface, priv->width, priv->height, priv->dstwidth and priv->dstheight.
- */
-static int setup_surfaces(void)
-{
-    struct sdl_priv_s *priv = &sdl_priv;
-    float v_scale = ((float) priv->dstheight) / priv->height;
-    int surfwidth, surfheight;
-
-    surfwidth = priv->width;
-    surfheight = priv->height + (priv->surface->h - priv->dstheight) / v_scale;
-    surfheight&= ~1;
-    /* Place the image in the middle of the screen */
-    priv->y = (surfheight - priv->height) / 2;
-    priv->y_screen_top = priv->y * v_scale;
-    priv->y_screen_bottom = priv->y_screen_top + priv->dstheight;
-
-    priv->dirty_off_frame[0].x = -1;
-    priv->dirty_off_frame[0].y = -1;
-    priv->dirty_off_frame[1].x = -1;
-    priv->dirty_off_frame[1].y = -1;
-
-    /* Make sure the entire screen is updated */
-    vo_osd_changed(1);
-
-    if(priv->rgbsurface)
-        SDL_FreeSurface(priv->rgbsurface);
-    else if(priv->overlay)
-        SDL_FreeYUVOverlay(priv->overlay);
-
-    priv->rgbsurface = NULL;
-    priv->overlay = NULL;
-
-    if(priv->mode != YUV && (priv->format&0xFF) == priv->bpp) {
-		if(strcmp(priv->driver, "x11") == 0) {
-            priv->dblit = 1;
-            priv->framePlaneRGB = priv->width * priv->height * priv->surface->format->BytesPerPixel;
-            priv->stridePlaneRGB = priv->width * priv->surface->format->BytesPerPixel;
-            erase_rectangle(0, 0, priv->surface->w, priv->surface->h);
-            return 0;
-        }
-	}
-
-	switch(priv->format) {
-	    	/* Initialize and create the RGB Surface used for video out in BGR/RGB mode */
-//SDL_Surface *SDL_CreateRGBSurface(Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
-		//	SDL_SWSURFACE,SDL_HWSURFACE,SDL_SRCCOLORKEY, priv->flags?	guess: exchange Rmask and Bmask for BGR<->RGB
-		// 32 bit: a:ff000000 r:ff000 g:ff00 b:ff
-		// 24 bit: r:ff0000 g:ff00 b:ff
-		// 16 bit: r:1111100000000000b g:0000011111100000b b:0000000000011111b
-		// 15 bit: r:111110000000000b g:000001111100000b b:000000000011111b
-		// FIXME: colorkey detect based on bpp, FIXME static bpp value, FIXME alpha value correct?
-	    case IMGFMT_RGB15:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 15, 31, 992, 31744, 0);
-	    break;
-	    case IMGFMT_BGR15:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 15, 31744, 992, 31, 0);
-	    break;
-	    case IMGFMT_RGB16:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 16, 31, 2016, 63488, 0);
-	    break;
-	    case IMGFMT_BGR16:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 16, 63488, 2016, 31, 0);
-	    break;
-	    case IMGFMT_RGB24:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 24, 0x0000FF, 0x00FF00, 0xFF0000, 0);
-	    break;
-	    case IMGFMT_BGR24:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 24, 0xFF0000, 0x00FF00, 0x0000FF, 0);
-	    break;
-	    case IMGFMT_RGB32:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0/*0xFF000000*/);
-	    break;
-	    case IMGFMT_BGR32:
-            priv->rgbsurface = SDL_CreateRGBSurface (SDL_SRCCOLORKEY, surfwidth, surfheight, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0/*0xFF000000*/);
-	    break;
-	    default:
-		/* Initialize and create the YUV Overlay used for video out */
-		if (!(priv->overlay = SDL_CreateYUVOverlay (surfwidth, surfheight, priv->format, priv->surface))) {
-			mp_tmsg(MSGT_VO,MSGL_WARN, "[VO_SDL] Couldn't create a YUV overlay: %s.\n", SDL_GetError());
-			return -1;
-		}
-		priv->framePlaneY = priv->width * priv->height;
-		priv->framePlaneUV = (priv->width * priv->height) >> 2;
-		priv->framePlaneYUY = priv->width * priv->height * 2;
-		priv->stridePlaneY = priv->width;
-		priv->stridePlaneUV = priv->width/2;
-		priv->stridePlaneYUY = priv->width * 2;
-	}
-
-    if(priv->mode != YUV) {
-        if(!priv->rgbsurface) {
-            mp_tmsg(MSGT_VO,MSGL_WARN, "[VO_SDL] Couldn't create an RGB surface: %s.\n", SDL_GetError());
-            return -1;
-        }
-
-        priv->dblit = 0;
-
-        if((priv->format&0xFF) != priv->bpp)
-            mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SDL] Using depth/colorspace conversion, this will slow things down (%ibpp -> %ibpp).\n", priv->format&0xFF, priv->bpp);
-
-        priv->framePlaneRGB = priv->width * priv->height * priv->rgbsurface->format->BytesPerPixel;
-        priv->stridePlaneRGB = priv->width * priv->rgbsurface->format->BytesPerPixel;
-    }
-
-    erase_rectangle(0, 0, surfwidth, surfheight);
-
-	return 0;
-}
-
-
-/**
- * Draw a frame to the SDL YUV overlay.
- *
- *   params : *src[] == the Y, U, and V planes that make up the frame.
- *  returns : non-zero on success, zero on error.
- **/
-
-//static int sdl_draw_frame (frame_t *frame)
-static int draw_frame(uint8_t *src[])
-{
-	struct sdl_priv_s *priv = &sdl_priv;
-	uint8_t *dst;
-	int i;
-	uint8_t *mysrc = src[0];
-
-    switch(priv->format){
-        case IMGFMT_YUY2: