diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /audio/out/ao_dsound.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'audio/out/ao_dsound.c')
| -rw-r--r-- | audio/out/ao_dsound.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index ae6a6de324..9ad27306bd 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -33,6 +33,7 @@ #include <math.h> #include <libavutil/avutil.h> +#include <libavutil/common.h> #include "config.h" #include "audio/format.h" |