diff options
| author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
| commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
| tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libvo/video_out.h | |
| parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
| parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
| download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libvo/video_out.h')
| -rw-r--r-- | libvo/video_out.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index efe3624b52..5c8e10a008 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -250,6 +250,7 @@ struct vo { struct MPOpts *opts; struct vo_x11_state *x11; struct vo_w32_state *w32; + struct vo_cocoa_state *cocoa; struct mp_fifo *key_fifo; struct encode_lavc_context *encode_lavc_ctx; struct input_ctx *input_ctx; |