From d08e407c9eb9b3fb020efa8f1516a68497389416 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Thu, 6 Jul 2017 10:40:40 -0700
Subject: hwdec: rename mediacodec to mediacodec-copy

---
 video/decode/vd_lavc.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'video/decode/vd_lavc.c')

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,
-- 
cgit v1.2.3