diff options
| author | Aman Gupta <aman@tmm1.net> | 2017-07-06 10:40:40 -0700 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-09 18:36:54 +0200 |
| commit | d08e407c9eb9b3fb020efa8f1516a68497389416 (patch) | |
| tree | 631c158bf09a050770dd6e0c4bb5b5a7b78bafde /video/decode/vd_lavc.c | |
| parent | cabb1ca54931d882c6063606c84925071b5ee59d (diff) | |
| download | mpv-d08e407c9eb9b3fb020efa8f1516a68497389416.tar.bz2 mpv-d08e407c9eb9b3fb020efa8f1516a68497389416.tar.xz | |
hwdec: rename mediacodec to mediacodec-copy
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 67b9cd4e17..ec22b42571 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -129,6 +129,7 @@ const struct m_sub_options vd_lavc_conf = { }, }; +extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy; extern const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox; extern const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox_copy; extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2; @@ -149,14 +150,6 @@ static const struct vd_lavc_hwdec mp_vd_lavc_rpi_copy = { }; #endif -#if HAVE_ANDROID -static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = { - .type = HWDEC_MEDIACODEC, - .lavc_suffix = "_mediacodec", - .copying = true, -}; -#endif - #if HAVE_CUDA_HWACCEL static const struct vd_lavc_hwdec mp_vd_lavc_cuda = { .type = HWDEC_CUDA, @@ -268,7 +261,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_d3d11va_copy, #endif #if HAVE_ANDROID - &mp_vd_lavc_mediacodec, + &mp_vd_lavc_mediacodec_copy, #endif #if HAVE_CUDA_HWACCEL &mp_vd_lavc_cuda, |