Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'

[ffmpeg] / configure

diff --git a/configure b/configure
index aa07224191fffbf284cd809b1cf80c57b9d2b1dc..6aadf9c7c843c2a3bb6a00597c44105a3795dadc 100755 (executable)
--- a/configure
+++ b/configure
@@ -5970,8 +5970,7 @@ enabled vdpau &&
     disable vdpau
 
 enabled vdpau && enabled xlib &&
-    check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
-    prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
+    check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
     enable vdpau_x11
 
 # Funny iconv installations are not unusual, so check it after all flags have been set