diff options
author | 2012-10-03 17:00:37 +0200 | |
---|---|---|
committer | 2012-10-16 07:26:31 +0200 | |
commit | 8f8f6e6d9d27eef37640b363214a775647a0f2f4 (patch) | |
tree | 64c78eebb58a563ce8d6d02559dcff6e30520276 /libvo | |
parent | cf61928eecd87ba29324e501a3e4a0efde25d874 (diff) |
sub: remove logic for disabling hinting on scaled EOSD
This was an extremely obscure setting, as it was used only with vo_gl
if its scaled-osd suboption was used. If you really want this, you can
set the desired ass-hinting value directly, and there will be literally
no loss in functionality.
Note that this didn't actually test whether the EOSD was scaled.
Basically, it only checked whether vo_gl had the scaled-osd suboption
set.
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_direct3d.c | 2 | ||||
-rw-r--r-- | libvo/vo_gl.c | 2 | ||||
-rw-r--r-- | libvo/vo_gl3.c | 2 | ||||
-rw-r--r-- | libvo/vo_vdpau.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index f8c9054b97..57bad61d02 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -1271,7 +1271,7 @@ static int query_format(d3d_priv *priv, uint32_t movie_fmt) int eosd_caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; if (priv->eosd) - eosd_caps |= VFCAP_EOSD | VFCAP_EOSD_UNSCALED; + eosd_caps |= VFCAP_EOSD; return eosd_caps; } diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 1fb788e780..e71e482feb 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -1116,7 +1116,7 @@ static int query_format(struct vo *vo, uint32_t format) int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE; if (p->use_osd) - caps |= VFCAP_OSD | VFCAP_EOSD | (p->scaled_osd ? 0 : VFCAP_EOSD_UNSCALED); + caps |= VFCAP_OSD | VFCAP_EOSD; if (format == IMGFMT_RGB24 || format == IMGFMT_RGBA) return caps; if (p->use_yuv && mp_get_chroma_shift(format, NULL, NULL, &depth) && diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c index 03d04b7038..5fd4f62af0 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -1758,7 +1758,7 @@ static int query_format(uint32_t format) { int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_ACCEPT_STRIDE | - VFCAP_OSD | VFCAP_EOSD | VFCAP_EOSD_UNSCALED | VFCAP_EOSD_RGBA; + VFCAP_OSD | VFCAP_EOSD | VFCAP_EOSD_RGBA; if (!init_format(format, NULL)) return 0; return caps; diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 14b9d0df63..64378a9a0c 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -1396,7 +1396,7 @@ static int query_format(uint32_t format) { int default_flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_EOSD - | VFCAP_EOSD_UNSCALED | VFCAP_EOSD_RGBA | VFCAP_FLIP; + | VFCAP_EOSD_RGBA | VFCAP_FLIP; switch (format) { case IMGFMT_YV12: case IMGFMT_I420: |