summaryrefslogtreecommitdiffstats
path: root/video/fmt-conversion.c
diff options
context:
space:
mode:
authorSebastien Zwickert <dilaroga@gmail.com>2015-07-11 17:21:39 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2015-08-05 17:47:30 +0200
commit31b5a211f4421cd593ef7eacda9efb9ee57a59d6 (patch)
tree4829f9d33e1ec7c604cbf0e3a38d7c26fdd09e3f /video/fmt-conversion.c
parent417e256c215e555198db1796edec3cfafd044459 (diff)
downloadmpv-31b5a211f4421cd593ef7eacda9efb9ee57a59d6.tar.bz2
mpv-31b5a211f4421cd593ef7eacda9efb9ee57a59d6.tar.xz
hwdec: add VideoToolbox support
VDA is being deprecated in OS X 10.11 so this is needed to keep hwdec working. The code needs libavcodec support which was added recently (to FFmpeg git, libav doesn't support it). Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Diffstat (limited to 'video/fmt-conversion.c')
-rw-r--r--video/fmt-conversion.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c
index b280e36945..797d243002 100644
--- a/video/fmt-conversion.c
+++ b/video/fmt-conversion.c
@@ -121,6 +121,9 @@ static const struct {
#if HAVE_VDA_HWACCEL
{IMGFMT_VDA, AV_PIX_FMT_VDA},
#endif
+#if HAVE_VIDEOTOOLBOX_HWACCEL
+ {IMGFMT_VIDEOTOOLBOX, AV_PIX_FMT_VIDEOTOOLBOX},
+#endif
{IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD},
{IMGFMT_DXVA2, AV_PIX_FMT_DXVA2_VLD},
#if HAVE_AV_PIX_FMT_MMAL