summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean First <jeanfirst@gmail.com>2011-10-12 21:54:33 +0200
committerMarton Balint <cus@passwd.hu>2011-10-16 19:28:22 +0200
commit72776adfb9f0b856198a770acdec97d523c01208 (patch)
tree57c87ee9a24c9b40a1925c8de6c75b98addd6825
parentabb0e4f63772fe96f5e221b8a579180cb4ebe5a9 (diff)
downloadffmpeg-streaming-72776adfb9f0b856198a770acdec97d523c01208.zip
ffmpeg-streaming-72776adfb9f0b856198a770acdec97d523c01208.tar.gz
ffplay: avoid window resize crash on osx with libsdl 1.2.14
Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--ffplay.c6
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);
OpenPOWER on IntegriCloud