summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--libvo/vo_vdpau.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/configure b/configure
index eb4bb04859..b2a53f88e5 100755
--- a/configure
+++ b/configure
@@ -4326,7 +4326,7 @@ if test "$_vdpau" = auto ; then
#include <vdpau/vdpau_x11.h>
int main(void) {
(void) vdp_device_create_x11(0, 0, 0, 0);
- return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;}
+ return VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1; }
EOF
cc_check -lvdpau && _vdpau=yes
fi
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index bd63626961..e6c21663e8 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -626,10 +626,6 @@ static int create_vdp_mixer(struct vo *vo, VdpChromaType vdp_chroma_type)
if (vc->sharpen)
features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_SHARPNESS;
if (vc->hqscaling) {
-#ifndef VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1
- mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] MPlayer was compiled with (old?) "
- "libvdpau headers with no support for requested hqscaling.\n");
-#else
VdpVideoMixerFeature hqscaling_feature =
VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 + vc->hqscaling-1;
VdpBool hqscaling_available;
@@ -642,7 +638,6 @@ static int create_vdp_mixer(struct vo *vo, VdpChromaType vdp_chroma_type)
else
mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] Your hardware or VDPAU "
"library does not support requested hqscaling.\n");
-#endif
}
vdp_st = vdp->video_mixer_create(vc->vdp_device, feature_count, features,