summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 23:50:26 +0300
commit1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch)
treec5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libvo/video_out.c
parentf2864e9a072f53c38a04dd7c44392521777dc908 (diff)
parent86c9fb2e8930de031807513c9b93d47394d2d2fa (diff)
downloadmpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2
mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz
Merge svn changes up to r29277
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r--libvo/video_out.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index eb348dd086..73926c541e 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -116,7 +116,7 @@ extern struct vo_driver video_out_cvidix;
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_macosx;
+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;
@@ -139,7 +139,7 @@ const struct vo_driver *video_out_drivers[] =
&video_out_kva,
#endif
#ifdef CONFIG_COREVIDEO
- &video_out_macosx,
+ &video_out_corevideo,
#endif
#ifdef CONFIG_QUARTZ
&video_out_quartz,