diff options
author | wm4 <wm4@nowhere> | 2014-04-29 15:12:38 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-05-02 01:08:04 +0200 |
commit | fd63f2f0377f30fb66ee8e78d36dffeb9c4a549a (patch) | |
tree | 8fe83003395b0f231be608f3950b4ebbb2d01209 /video/out | |
parent | ec28a281b9612978a3cc3c8dd6c91dbb9b61823f (diff) | |
download | mpv-fd63f2f0377f30fb66ee8e78d36dffeb9c4a549a.tar.bz2 mpv-fd63f2f0377f30fb66ee8e78d36dffeb9c4a549a.tar.xz |
vdpau_mixer: allow overriding frame opts
So a caller can override the filter options dictated by vf_vdpaupp.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/gl_hwdec_vdpau.c | 2 | ||||
-rw-r--r-- | video/out/vo_vdpau.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_hwdec_vdpau.c b/video/out/gl_hwdec_vdpau.c index 7a33e05051..e8f041615a 100644 --- a/video/out/gl_hwdec_vdpau.c +++ b/video/out/gl_hwdec_vdpau.c @@ -191,7 +191,7 @@ static int map_image(struct gl_hwdec *hw, struct mp_image *hw_image, if (!p->vdpgl_surface) return -1; - mp_vdpau_mixer_render(p->mixer, p->vdp_surface, NULL, hw_image, NULL); + mp_vdpau_mixer_render(p->mixer, NULL, p->vdp_surface, NULL, hw_image, NULL); gl->VDPAUMapSurfacesNV(1, &p->vdpgl_surface); out_textures[0] = p->gl_texture; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 463739a998..4904d78dd1 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -204,7 +204,7 @@ static int render_video_to_output_surface(struct vo *vo, return 0; } - mp_vdpau_mixer_render(vc->video_mixer, output_surface, output_rect, + mp_vdpau_mixer_render(vc->video_mixer, NULL, output_surface, output_rect, bv[dp].mpi, video_rect); return 0; } |