diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libao2/ao_sdl.c | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libao2/ao_sdl.c')
-rw-r--r-- | libao2/ao_sdl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index 2da0073da7..645c9e9685 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -52,7 +52,7 @@ LIBAO_EXTERN(sdl) #undef USE_SDL_INTERNAL_MIXER // Samplesize used by the SDLlib AudioSpec struct -#if defined(WIN32) || defined(__AMIGAOS4__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__AMIGAOS4__) #define SAMPLESIZE 2048 #else #define SAMPLESIZE 1024 |