summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authornplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-02 21:17:27 +0000
committernplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-02 21:17:27 +0000
commit1e7905dea871c4f9a2874de80aceae977835b818 (patch)
tree551e6f91a16b96d0dacc390b4a54b4c6b584de49 /libvo
parent6498f50a7fa37bb73c5a0978d4f937be22bcb137 (diff)
downloadmpv-1e7905dea871c4f9a2874de80aceae977835b818.tar.bz2
mpv-1e7905dea871c4f9a2874de80aceae977835b818.tar.xz
enable panscan
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15332 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_macosx.m9
1 files changed, 5 insertions, 4 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index c3d9db97f4..6a3fa0e453 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -420,10 +420,10 @@ static uint32_t control(uint32_t request, void *data, ...)
glColor3f(1,1,1);
glBegin(GL_QUADS);
- glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i(image_rec.origin.x, image_rec.origin.y);
- glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i(image_rec.origin.x, image_rec.size.height);
- glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i(image_rec.size.width, image_rec.size.height);
- glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i(image_rec.size.width, image_rec.origin.y);
+ glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( image_rec.origin.x-(vo_panscan_x >> 1), image_rec.origin.y-(vo_panscan_y >> 1));
+ glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i( image_rec.origin.x-(vo_panscan_x >> 1), image_rec.size.height+(vo_panscan_y >> 1));
+ glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i( image_rec.size.width+(vo_panscan_x >> 1), image_rec.size.height+(vo_panscan_y >> 1));
+ glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i( image_rec.size.width+(vo_panscan_x >> 1), image_rec.origin.y-(vo_panscan_y >> 1));
glEnd();
glFlush();
@@ -540,6 +540,7 @@ static uint32_t control(uint32_t request, void *data, ...)
*/
- (void) panscan
{
+ panscan_calc();
}
/*