diff options
| author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
| commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
| tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /osdep/cocoa_events.m | |
| parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
| parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
| download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.c
Diffstat (limited to 'osdep/cocoa_events.m')
| -rw-r--r-- | osdep/cocoa_events.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/cocoa_events.m b/osdep/cocoa_events.m index ba09c13cad..e6d941d19b 100644 --- a/osdep/cocoa_events.m +++ b/osdep/cocoa_events.m @@ -106,7 +106,7 @@ void cocoa_events_init(struct input_ctx *ictx, *p = (struct priv){ .is_runloop_polling = NO, .read_all_fd_events = read_all_fd_events, - .select_queue = dispatch_queue_create("org.mplayer2.select_queue", + .select_queue = dispatch_queue_create("org.mpv.select_queue", NULL), }; } |