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 /video/out/w32_common.h | |
| 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 'video/out/w32_common.h')
| -rw-r--r-- | video/out/w32_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/video/out/w32_common.h b/video/out/w32_common.h index a71ccaa661..d8df37d6fa 100644 --- a/video/out/w32_common.h +++ b/video/out/w32_common.h @@ -49,6 +49,8 @@ struct vo_w32_state { int mon_id; }; +struct vo; + int vo_w32_init(struct vo *vo); void vo_w32_uninit(struct vo *vo); void vo_w32_ontop(struct vo *vo); |