Merge changes I505c4aea,I2ae0529c

* changes:
  Import SDL release-1.2.15
  Handle SDL windows with BGRA color

1 files changed, 37 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/video/SDL_yuvfuncs.h b/distrib/sdl-1.2.15/src/video/SDL_yuvfuncs.h
new file mode 100644
index 0000000..cb496b6
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/video/SDL_yuvfuncs.h
@@ -0,0 +1,37 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+/* This is the definition of the YUV video surface function structure */
+
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+
+#ifndef _THIS
+#define _THIS	SDL_VideoDevice *_this
+#endif
+struct private_yuvhwfuncs {
+	int (*Lock)(_THIS, SDL_Overlay *overlay);
+	void (*Unlock)(_THIS, SDL_Overlay *overlay);
+	int (*Display)(_THIS, SDL_Overlay *overlay, SDL_Rect *src, SDL_Rect *dst);
+	void (*FreeHW)(_THIS, SDL_Overlay *overlay);
+};