From 4b0e85d4abbb70453d2f61257ce111d21299a28e Mon Sep 17 00:00:00 2001
From: Earl Levine <elevine@gmail.com>
Date: Fri, 19 May 2006 08:38:09 +0000
Subject: Fix segfault on Mac OS X, patch by Earl Levine
 elevine**@**gmail**.**com.

Originally committed as revision 5408 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffplay.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ffplay.c')

diff --git a/ffplay.c b/ffplay.c
index 80ff4b5633..360ee9716a 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2434,8 +2434,8 @@ int main(int argc, char **argv)
         video_disable = 1;
     }
     flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
-#ifndef CONFIG_WIN32
-    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 */
+#if !defined(CONFIG_WIN32) && !defined(CONFIG_DARWIN)
+    flags |= SDL_INIT_EVENTTHREAD; /* Not supported on win32 or darwin */
 #endif
     if (SDL_Init (flags)) {
         fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
@@ -2466,7 +2466,12 @@ int main(int argc, char **argv)
             h = screen_height;
             flags |= SDL_RESIZABLE;
         }
+#ifndef CONFIG_DARWIN
         screen = SDL_SetVideoMode(w, h, 0, flags);
+#else
+        /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
+        screen = SDL_SetVideoMode(w, h, 24, flags);
+#endif
         if (!screen) {
             fprintf(stderr, "SDL: could not set video mode - exiting\n");
             exit(1);
-- 
cgit v1.2.3