summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:36:05 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-08 01:36:05 +0200
commitb390b9b28fa6280f355eeef4811b6cfc02dea01a (patch)
treeef67be7ab1b189f5818fb8a273fa10f19d19aec6 /mplayer.c
parentefe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (diff)
parent8e778e501948b67b1f8cd889e68242d1a1eb6041 (diff)
downloadmpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.bz2
mpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.xz
Merge svn changes up to r30185
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 373adb6d1d..ac97aed389 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1140,8 +1140,12 @@ void init_vo_spudec(struct MPContext *mpctx)
* will be done automatically by replacing our main() if we include SDL.h.
*/
#if defined(__APPLE__) && defined(CONFIG_SDL)
+#ifdef CONFIG_SDL_SDL_H
+#include <SDL/SDL.h>
+#else
#include <SDL.h>
#endif
+#endif
/**
* \brief append a formatted string