From 6d2c5fc99a0e0150bb88588463e9272e5bc46d0d Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 6 Nov 2013 00:45:17 +0100 Subject: 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. --- video/decode/vd_lavc.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'video/decode/vd_lavc.c') 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, -- cgit v1.2.3