--- a/src/video/SDL_yuv.c	Sat Jul 26 19:50:00 2003 +0000
+++ b/src/video/SDL_yuv.c	Sat Jul 26 20:02:00 2003 +0000
@@ -32,6 +32,7 @@
 
 #include "SDL_getenv.h"
 #include "SDL_video.h"
+#include "SDL_error.h"
 #include "SDL_sysvideo.h"
 #include "SDL_yuvfuncs.h"
 #include "SDL_yuv_sw_c.h"
@@ -45,7 +46,10 @@
 	const char *yuv_hwaccel;
 	SDL_Overlay *overlay;
 
-	overlay = NULL;
+	if ( (SDL_VideoSurface->flags & SDL_OPENGL) == SDL_OPENGL ) {
+		SDL_SetError("YUV overlays are not supported in OpenGL mode");
+		return NULL;
+	}
 
 	/* Display directly on video surface, if possible */
 	if ( getenv("SDL_VIDEO_YUV_DIRECT") ) {
@@ -55,6 +59,7 @@
 			display = SDL_VideoSurface;
 		}
 	}
+	overlay = NULL;
         yuv_hwaccel = getenv("SDL_VIDEO_YUV_HWACCEL");
 	if ( ((display == SDL_VideoSurface) && video->CreateYUVOverlay) &&
 	     (!yuv_hwaccel || (atoi(yuv_hwaccel) > 0)) ) {