diff options
author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libvo/vo_direct3d.c | |
parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libvo/vo_direct3d.c')
-rw-r--r-- | libvo/vo_direct3d.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index bbcce41ca1..2fa71d0d70 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -145,8 +145,6 @@ typedef struct d3d_priv { fullscreen */ int src_width; /**< Source (movie) width */ int src_height; /**< Source (movie) heigth */ - int src_d_width; /**< Source (movie) aspect corrected width */ - int src_d_height; /**< Source (movie) aspect corrected heigth */ int border_x; /**< horizontal border value for OSD */ int border_y; /**< vertical border value for OSD */ int image_format; /**< mplayer image format */ @@ -1546,9 +1544,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, return VO_ERROR; } - priv->src_d_width = d_width; - priv->src_d_height = d_height; - if ((priv->image_format != format) || (priv->src_width != width) || (priv->src_height != height)) @@ -1806,8 +1801,8 @@ static mp_image_t *get_screenshot(d3d_priv *priv) return NULL; } - image->w = priv->src_d_width; - image->h = priv->src_d_height; + image->w = priv->vo->aspdat.prew; + image->h = priv->vo->aspdat.preh; return image; } |