diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_ass.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_vo.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vfcap.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 63355bff0f..f88ed99eca 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -92,7 +92,7 @@ static int config(struct vf_instance_s* vf, vf->priv->dirty_rows = malloc(vf->priv->outh); if (vf->priv->ass_priv) { - ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh); + ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0); ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height); } diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 9d320cf855..fc1ca92d42 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -60,14 +60,14 @@ static int config(struct vf_instance_s* vf, } // save vo's stride capability for the wanted colorspace: - vf->default_caps=query_format(vf,outfmt) & VFCAP_ACCEPT_STRIDE; + vf->default_caps=query_format(vf,outfmt); if(config_video_out(video_out,width,height,d_width,d_height,flags,"MPlayer",outfmt)) return 0; #ifdef USE_ASS if (vf->priv->ass_priv) - ass_configure(vf->priv->ass_priv, width, height); + ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED)); #endif ++vo_config_count; diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h index 9c2288e8a3..0cc9c4ec4d 100644 --- a/libmpcodecs/vfcap.h +++ b/libmpcodecs/vfcap.h @@ -28,4 +28,5 @@ #define VFCAP_CONSTANT 0x1000 // filter can draw EOSD #define VFCAP_EOSD 0x2000 - +// filter will draw EOSD at screen resolution (without scaling) +#define VFCAP_EOSD_UNSCALED 0x4000 |