Merge commit '932cc649'

* commit '932cc649':
  vdpau: Do not #include vdpau_x11.h from the main vdpau header
Merged-by: Clément Bœsch <u@pkh.me>

libavcodec/vdpau.h

@@ -50,7 +50,7 @@
  */
 
 #include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
+
 #include "libavutil/avconfig.h"
 #include "libavutil/attributes.h"