Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'

* commit '38392b2af815898b8716826c4e29d95c04fb2647':
  hwcontext_vdpau: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc configure
index aa07224,261200d..6aadf9c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -5970,13 -4766,9 +5970,12 @@@ 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
 +disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 +
  enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
  
  # add some useful compiler flags if supported

diff --cc libavutil/hwcontext_vdpau.c
Simple merge