diff options
| author | wm4 <wm4@nowhere> | 2016-05-03 13:56:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-05-03 13:56:11 +0200 |
| commit | eefe7ad28bceccd509d389dc4dba465467231fb1 (patch) | |
| tree | 5b5614225e09f17ff2ea8541bbbcc82c286edacd /video/out/vo_vdpau.c | |
| parent | 51e4c065ff9eef34da1729e5c8fc629b80f58c24 (diff) | |
| download | mpv-eefe7ad28bceccd509d389dc4dba465467231fb1.tar.bz2 mpv-eefe7ad28bceccd509d389dc4dba465467231fb1.tar.xz | |
vo_opengl: vdpau: fix certain cases of preemption recovery failures
The vdpau_mixer could fail to be recreated properly if preemption
occured at some point before playback initialization (like when using
--hwdec-preload and the opengl-cb API).
Normally, the vdpau_mixer was supposed to be marked invalid when the
components using it detect a preemption, e.g. in hwdec_vdpau.c. This one
didn't mark the vdpau_mixer as invalid if preemption was detected in
reinit(), only in map_image().
It's cleaner to detect preemption directly in the vdpau_mixer, which
ensures it's always recreated correctly.
Diffstat (limited to 'video/out/vo_vdpau.c')
| -rw-r--r-- | video/out/vo_vdpau.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index b85780e5f8..1dc5dc3b36 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -448,7 +448,6 @@ static void mark_vdpau_objects_uninitialized(struct vo *vo) forget_frames(vo, false); vc->black_pixel = VDP_INVALID_HANDLE; - vc->video_mixer->video_mixer = VDP_INVALID_HANDLE; vc->flip_queue = VDP_INVALID_HANDLE; vc->flip_target = VDP_INVALID_HANDLE; for (int i = 0; i < MAX_OUTPUT_SURFACES; i++) |