diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /libmpcodecs/vf.c | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'libmpcodecs/vf.c')
| -rw-r--r-- | libmpcodecs/vf.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index b9937e578c..10b9fa546f 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -64,7 +64,7 @@ extern const vf_info_t vf_info_divtc; extern const vf_info_t vf_info_softskip; extern const vf_info_t vf_info_screenshot; extern const vf_info_t vf_info_screenshot_force; -extern const vf_info_t vf_info_ass; +extern const vf_info_t vf_info_sub; extern const vf_info_t vf_info_yadif; extern const vf_info_t vf_info_stereo3d; extern const vf_info_t vf_info_dlopen; @@ -102,9 +102,7 @@ static const vf_info_t *const filter_list[] = { &vf_info_delogo, &vf_info_phase, &vf_info_divtc, -#ifdef CONFIG_ASS - &vf_info_ass, -#endif + &vf_info_sub, &vf_info_yadif, &vf_info_stereo3d, &vf_info_dlopen, @@ -541,6 +539,12 @@ void vf_clone_mpi_attributes(mp_image_t *dst, mp_image_t *src) if (dst->width == src->width && dst->height == src->height) { dst->qstride = src->qstride; dst->qscale = src->qscale; + dst->display_w = src->display_w; + dst->display_h = src->display_h; + } + if ((dst->flags & MP_IMGFLAG_YUV) == (src->flags & MP_IMGFLAG_YUV)) { + dst->colorspace = src->colorspace; + dst->levels = src->levels; } } |