diff options
| -rw-r--r-- | DOCS/man/en/options.rst | 1 | ||||
| -rw-r--r-- | mpvcore/options.c | 1 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 14 |
3 files changed, 0 insertions, 16 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 71748574aa..e1253ce17b 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1121,7 +1121,6 @@ OPTIONS :vaapi: requires ``--vo=opengl`` or ``--vo=vaapi`` (Linux with Intel GPUs only) :vaapi-copy: copies video back into system RAM (Linux with Intel GPUs only) :vda: requires ``--vo=corevideo`` (OSX only) - :crystalhd: Broadcom Crystal HD ``auto`` tries to automatically enable hardware decoding using the first available method. This still depends what VO you are using. For example, diff --git a/mpvcore/options.c b/mpvcore/options.c index 3d65ec337e..52cfa6fd52 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -487,7 +487,6 @@ const m_option_t mp_opts[] = { {"auto", -1}, {"vdpau", 1}, {"vda", 2}, - {"crystalhd", 3}, {"vaapi", 4}, {"vaapi-copy", 5})), OPT_STRING("hwdec-codecs", hwdec_codecs, 0), diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index c6a939ec51..ab5608942a 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -90,19 +90,6 @@ const struct vd_lavc_hwdec mp_vd_lavc_vda; const struct vd_lavc_hwdec mp_vd_lavc_vaapi; const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy; -static const struct vd_lavc_hwdec mp_vd_lavc_crystalhd = { - .type = HWDEC_CRYSTALHD, - .codec_pairs = (const char *[]) { - "mpeg2", "mpeg2_crystalhd", - "msmpeg4", "msmpeg4_crystalhd", - "wmv3", "wmv3_crystalhd", - "vc1", "vc1_crystalhd", - "h264", "h264_crystalhd", - "mpeg4", "mpeg4_crystalhd", - NULL - }, -}; - static const struct vd_lavc_hwdec *hwdec_list[] = { #if HAVE_VDPAU_HWACCEL &mp_vd_lavc_vdpau, @@ -113,7 +100,6 @@ static const struct vd_lavc_hwdec *hwdec_list[] = { #if HAVE_VDA_HWACCEL &mp_vd_lavc_vda, #endif - &mp_vd_lavc_crystalhd, #if HAVE_VAAPI_HWACCEL &mp_vd_lavc_vaapi, &mp_vd_lavc_vaapi_copy, |