[FFmpeg-cvslog] macosx: use the default surface on newer sdl

Luca Barbato git at videolan.org
Wed Oct 19 02:15:09 CEST 2011


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Oct 16 22:31:53 2011 -0700| [ec5e521298f2a7c8b42f4d247dbf09009d400355] | committer: Luca Barbato

macosx: use the default surface on newer sdl

SDL 1.2.14 works fine with default colorspace on macosx and seems
to have some issues with 24bit surfaces and resize in addition.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec5e521298f2a7c8b42f4d247dbf09009d400355
---

 avplay.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/avplay.c b/avplay.c
index a4b58a5..225f81a 100644
--- a/avplay.c
+++ b/avplay.c
@@ -904,11 +904,11 @@ static int video_open(VideoState *is){
        && is->height== screen->h && screen->h == h)
         return 0;
 
-#ifndef __APPLE__
-    screen = SDL_SetVideoMode(w, h, 0, flags);
-#else
-    /* setting bits_per_pixel = 0 or 32 causes blank video on OS X */
+#if defined(__APPLE__) && !SDL_VERSION_ATLEAST(1, 2, 14)
+    /* setting bits_per_pixel = 0 or 32 causes blank video on OS X and older SDL */
     screen = SDL_SetVideoMode(w, h, 24, flags);
+#else
+    screen = SDL_SetVideoMode(w, h, 0, flags);
 #endif
     if (!screen) {
         fprintf(stderr, "SDL: could not set video mode - exiting\n");



More information about the ffmpeg-cvslog mailing list