summaryrefslogtreecommitdiff
path: root/src/video_out/macosx/XineVideoWindow.m
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-11 18:02:28 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-11 18:02:28 +0200
commit15bec9c12fac932ab58bca4b9290739adfbad2d4 (patch)
tree101816e08a9eb174006f2e11eef551096a6d496f /src/video_out/macosx/XineVideoWindow.m
parent7f681f2a62b500846ff337d5e75e915507d1751f (diff)
parent926542d8abcb138208a175ca09ef12e6a9f468f4 (diff)
downloadxine-lib-15bec9c12fac932ab58bca4b9290739adfbad2d4.tar.gz
xine-lib-15bec9c12fac932ab58bca4b9290739adfbad2d4.tar.bz2
Merge changes from 1.1 branch (where they still make sense).
Diffstat (limited to 'src/video_out/macosx/XineVideoWindow.m')
-rw-r--r--src/video_out/macosx/XineVideoWindow.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_out/macosx/XineVideoWindow.m b/src/video_out/macosx/XineVideoWindow.m
index b61a5b418..0dd2caa28 100644
--- a/src/video_out/macosx/XineVideoWindow.m
+++ b/src/video_out/macosx/XineVideoWindow.m
@@ -108,7 +108,7 @@
}
-- (XineOpenGLView *) xineView
+- (id) xineView
{
return xineView;
}