Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'

* commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a':
  vdpau: Do not #include vdpau_x11.h from the main vdpau header

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/vdpau.h
index e85e4d9,acd63cc..855d387
--- 1/libavcodec/vdpau.h
--- 2/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@@ -50,8 -50,7 +50,8 @@@
   */
  
  #include <vdpau/vdpau.h>
- #include <vdpau/vdpau_x11.h>
+ 
 +#include "libavutil/avconfig.h"
  #include "libavutil/attributes.h"
  
  #include "avcodec.h"