From 9b60398f4e2710e304eb4bbb51ed70e0b8523845 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 26 Sep 2017 19:13:26 +0200 Subject: video: remove old videotoolbox support Like as in previous commits, you need a very recent FFmpeg (probably git master). --- video/out/opengl/hwdec_ios.m | 4 ---- video/out/opengl/hwdec_osx.c | 4 ---- 2 files changed, 8 deletions(-) (limited to 'video/out') diff --git a/video/out/opengl/hwdec_ios.m b/video/out/opengl/hwdec_ios.m index 8c353bf46f..b55230292e 100644 --- a/video/out/opengl/hwdec_ios.m +++ b/video/out/opengl/hwdec_ios.m @@ -29,7 +29,6 @@ #include "video/out/gpu/hwdec.h" #include "video/mp_image_pool.h" -#include "video/vt.h" #include "ra_gl.h" struct priv_owner { @@ -71,14 +70,11 @@ static int init(struct ra_hwdec *hw) p->hwctx = (struct mp_hwdec_ctx){ .type = HWDEC_VIDEOTOOLBOX, - .download_image = mp_vt_download_image, .ctx = &p->hwctx, }; -#if HAVE_VIDEOTOOLBOX_HWACCEL_NEW av_hwdevice_ctx_create(&p->hwctx.av_device_ref, AV_HWDEVICE_TYPE_VIDEOTOOLBOX, NULL, NULL, 0); -#endif hwdec_devices_add(hw->devs, &p->hwctx); diff --git a/video/out/opengl/hwdec_osx.c b/video/out/opengl/hwdec_osx.c index cfd5f52e7b..0e72f1511c 100644 --- a/video/out/opengl/hwdec_osx.c +++ b/video/out/opengl/hwdec_osx.c @@ -30,7 +30,6 @@ #include "video/mp_image_pool.h" #include "video/out/gpu/hwdec.h" -#include "video/vt.h" #include "ra_gl.h" struct priv_owner { @@ -72,14 +71,11 @@ static int init(struct ra_hwdec *hw) p->hwctx = (struct mp_hwdec_ctx){ .type = HWDEC_VIDEOTOOLBOX, - .download_image = mp_vt_download_image, .ctx = &p->hwctx, }; -#if HAVE_VIDEOTOOLBOX_HWACCEL_NEW av_hwdevice_ctx_create(&p->hwctx.av_device_ref, AV_HWDEVICE_TYPE_VIDEOTOOLBOX, NULL, NULL, 0); -#endif hwdec_devices_add(hw->devs, &p->hwctx); -- cgit v1.2.3