summaryrefslogtreecommitdiffstats
path: root/libao2
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 /libao2
parentefe742e3fa08f007ab41f1d666fd1f1c3bf0d63a (diff)
parent8e778e501948b67b1f8cd889e68242d1a1eb6041 (diff)
downloadmpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.bz2
mpv-b390b9b28fa6280f355eeef4811b6cfc02dea01a.tar.xz
Merge svn changes up to r30185
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_sdl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 47a05ef2fa..0cef28c913 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -31,7 +31,11 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "libaf/af_format.h"
+#ifdef CONFIG_SDL_SDL_H
+#include <SDL/SDL.h>
+#else
#include <SDL.h>
+#endif
#include "osdep/timer.h"
#include "libavutil/fifo.h"