diff options
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 094d5b1a12..540fedb132 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -118,7 +118,6 @@ extern struct vo_driver video_out_tdfx_vid; extern struct vo_driver video_out_xvr100; extern struct vo_driver video_out_tga; extern struct vo_driver video_out_corevideo; -extern struct vo_driver video_out_quartz; extern struct vo_driver video_out_pnm; extern struct vo_driver video_out_md5sum; @@ -140,12 +139,12 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_KVA &video_out_kva, #endif +#ifdef CONFIG_GL_COCOA + &video_out_gl, +#endif #ifdef CONFIG_COREVIDEO &video_out_corevideo, #endif -#ifdef CONFIG_QUARTZ - &video_out_quartz, -#endif #ifdef CONFIG_XMGA &video_out_xmga, #endif @@ -183,7 +182,7 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_SDL &video_out_sdl, #endif -#ifdef CONFIG_GL +#if (defined CONFIG_GL && !defined CONFIG_GL_COCOA) &video_out_gl, #endif #ifdef CONFIG_DGA @@ -378,6 +377,7 @@ void vo_seek_reset(struct vo *vo) { vo_control(vo, VOCTRL_RESET, NULL); vo->frame_loaded = false; + vo->hasframe = false; } void vo_destroy(struct vo *vo) |