diff options
| author | wm4 <wm4@nowhere> | 2015-03-05 13:02:30 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-05 13:02:30 +0100 |
| commit | 27b5492a828b5321a2f379f88f8f425cac0bbb85 (patch) | |
| tree | c6e782942e95b3488e8328c4aa2939ab8bda8742 /video | |
| parent | 9657e5a2caef74de799fab0b9920284660865da9 (diff) | |
| download | mpv-27b5492a828b5321a2f379f88f8f425cac0bbb85.tar.bz2 mpv-27b5492a828b5321a2f379f88f8f425cac0bbb85.tar.xz | |
vd_lavc: let --hwdec=auto select "vaapi-copy"
Instead of "vaapi", simply by changing the probe order.
"vaapi" uses the GLX GL interop, which has causing us more problems than
it solved.
Unfortunately this leads also to copying if "--hwdec=auto --vo=vaapi" is
used, even though GLX is not involved in this case - but I don't care
enough to make the probe logic cleverer just for this. You can still get
the zero-copy path with --hwdec=vaapi.
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/vd_lavc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e32ff6b01e..4bad7c51d9 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -130,8 +130,8 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_vda, #endif #if HAVE_VAAPI_HWACCEL - &mp_vd_lavc_vaapi, &mp_vd_lavc_vaapi_copy, + &mp_vd_lavc_vaapi, #endif #if HAVE_DXVA2_HWACCEL &mp_vd_lavc_dxva2_copy, |