summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-06 00:45:17 +0100
committerwm4 <wm4@nowhere>2013-11-06 00:47:53 +0100
commit6d2c5fc99a0e0150bb88588463e9272e5bc46d0d (patch)
tree2120664bd80321d574a8d1111ab7354049df62ad
parent3cfbe810383d8efd04e8c0b3ad47cfe73f69ca97 (diff)
downloadmpv-6d2c5fc99a0e0150bb88588463e9272e5bc46d0d.tar.bz2
mpv-6d2c5fc99a0e0150bb88588463e9272e5bc46d0d.tar.xz
vd_lavc: remove explicit crystalhd support
This removes "--hwdec=crystalhd". I doubt anyone even tried to use this. But even if someone wants to use it, the decoders can still be explicitly invoked with e.g.: --vd=lavc:h264_crystalhd The only advantage our special code provided was fallback to software decoding. (But I'm not sure how the ffmpeg crystalhd pseudo-decoder actually behaves.) Removing this will allow some simplifications as soon as we don't need vdpau_old.c anymore.
-rw-r--r--DOCS/man/en/options.rst1
-rw-r--r--mpvcore/options.c1
-rw-r--r--video/decode/vd_lavc.c14
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,