From 0ae292fbcb03fadd57501b831603783c5a5a5754 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 11 May 2010 03:57:04 +0300 Subject: [PATCH] vdpau: drop support for old versions Since I dropped the hack to support older libvdpau versions (without MPEG4 / hqscaling features) from the FFmpeg version used in the build repo it's better to disable those libvdpau versions in MPlayer too. Change the configure check to require a newer libvdpau version, and drop compatibility code in vo_vdpau.c. --- configure | 2 +- libvo/vo_vdpau.c | 5 ----- 2 files changed, 1 insertion(+), 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 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,