summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-24 10:51:24 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-24 10:51:24 +0000
commit6023874828599e37e14056e5fc10325adfdba50c (patch)
tree86331fba2927b1a4494b10a25f662702b61ecc11 /libvo
parent1414f844c565a5c0170bb7250eafbd84ffdb93c6 (diff)
downloadmpv-6023874828599e37e14056e5fc10325adfdba50c.tar.bz2
mpv-6023874828599e37e14056e5fc10325adfdba50c.tar.xz
Some ugly hacks to make compiling against a newer external version of libass work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/video_out.h1
-rw-r--r--libvo/vo_gl.c1
-rw-r--r--libvo/vo_vdpau.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h
index b143ff5554..b9380fadf1 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -74,6 +74,7 @@
#define VOCTRL_GET_EOSD_RES 29
typedef struct {
int w, h; // screen dimensions, including black borders
+ int srcw, srch; // unscaled source dimensions
int mt, mb, ml, mr; // borders (top, bottom, left, right)
} mp_eosd_res_t;
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 5aa10bf71e..5e35f79f99 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -1156,6 +1156,7 @@ static int control(uint32_t request, void *data, ...)
{
mp_eosd_res_t *r = data;
r->w = vo_dwidth; r->h = vo_dheight;
+ r->srcw = image_width; r->srch = image_height;
r->mt = r->mb = r->ml = r->mr = 0;
if (scaled_osd) {r->w = image_width; r->h = image_height;}
else if (aspect_scaling()) {
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 6c68210386..2ee7cccf9b 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -1400,6 +1400,7 @@ static int control(uint32_t request, void *data, ...)
case VOCTRL_GET_EOSD_RES: {
mp_eosd_res_t *r = data;
r->mt = r->mb = r->ml = r->mr = 0;
+ r->srcw = vid_width; r->srch = vid_height;
if (vo_fs) {
r->w = vo_screenwidth;
r->h = vo_screenheight;