diff options
| author | wm4 <wm4@nowhere> | 2013-12-07 19:32:44 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-07 19:32:44 +0100 |
| commit | bb6165342db0ba60fefa97afe770b393fd6cb463 (patch) | |
| tree | e97e2a9ab048dd339ff6bfd7112ab9e23bb6e7e6 /video/filter/vf_vavpp.c | |
| parent | 75d3bf4711f88a79af5fd3246a9503dbd6e01586 (diff) | |
| download | mpv-bb6165342db0ba60fefa97afe770b393fd6cb463.tar.bz2 mpv-bb6165342db0ba60fefa97afe770b393fd6cb463.tar.xz | |
video: create a separate context for video filter chain
This adds vf_chain, which unlike vf_instance refers to the filter chain
as a whole. This makes the filter API less awkward, and will allow
handling format negotiation better.
Diffstat (limited to 'video/filter/vf_vavpp.c')
| -rw-r--r-- | video/filter/vf_vavpp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c index 352f2a586c..1a8a974e11 100644 --- a/video/filter/vf_vavpp.c +++ b/video/filter/vf_vavpp.c @@ -372,10 +372,8 @@ static int vf_open(vf_instance_t *vf) vf->control = control; struct vf_priv_s *p = vf->priv; - struct mp_hwdec_info hwdec = {0}; - vf_control(vf->next, VFCTRL_GET_HWDEC_INFO, &hwdec); - hwdec_request_api(&hwdec, "vaapi"); - p->va = hwdec.vaapi_ctx; + hwdec_request_api(vf->hwdec, "vaapi"); + p->va = vf->hwdec ? vf->hwdec->vaapi_ctx : NULL; if (!p->va || !p->va->display) return false; p->display = p->va->display; |