[FFmpeg-cvslog] ffplay: avoid window resize crash on osx with libsdl 1.2.14

Jean First git at videolan.org
Sun Oct 16 23:53:14 CEST 2011


ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Wed Oct 12 21:54:33 2011 +0200| [72776adfb9f0b856198a770acdec97d523c01208] | committer: Marton Balint

ffplay: avoid window resize crash on osx with libsdl 1.2.14

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 ffplay.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index a0c8487..b41820c 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -943,13 +943,7 @@ static int video_open(VideoState *is){
     if(screen && is->width == screen->w && screen->w == w
        && 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 */
-    screen = SDL_SetVideoMode(w, h, 24, flags);
-#endif
     if (!screen) {
         fprintf(stderr, "SDL: could not set video mode - exiting\n");
         do_exit(is);



More information about the ffmpeg-cvslog mailing list