From fa8b2be4de852a3fc0ef340543a1f6737d611435 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 2 Mar 2016 22:20:04 +0100 Subject: av_common: explicitly exclude _vdpau deccoders from enumeration Completely pointless abominations that FFmpeg refuses to remove. They are ancient, long deprecated API which we can't use anymore. They confused users as well. Pretend that they don't exist. Due to the way --vd works, they can't even be forced anymore. The older hack which explicitly rejects these can be dropped as well. --- video/decode/vd_lavc.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'video/decode') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 0520c3a4fd..fa1d2ddf55 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -335,17 +335,6 @@ static int init(struct dec_video *vd, const char *decoder) ctx->opts = vd->opts; ctx->decoder = talloc_strdup(ctx, decoder); - if (bstr_endswith0(bstr0(decoder), "_vdpau")) { - MP_WARN(vd, "VDPAU decoder '%s' was requested. " - "This way of enabling hardware\ndecoding is not supported " - "anymore. Use --hwdec=vdpau instead.\nThe --hwdec-codec=... " - "option can be used to restrict which codecs are\nenabled, " - "otherwise all hardware decoding is tried for all codecs.\n", - decoder); - uninit(vd); - return 0; - } - reinit(vd); if (!ctx->avctx) { -- cgit v1.2.3