Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
authorClément Bœsch <u@pkh.me>
Sat, 15 Apr 2017 16:36:30 +0000 (18:36 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 15 Apr 2017 16:36:30 +0000 (18:36 +0200)
commitd40e181bec22014a9ea312ab6837f7f0bc4f9e42
tree975e70752b71603d0e89467702dfcd4bf4beed74
parent9e86a61870c1652cdcc6a34646aee40d973ba23b
parent932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a
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>
libavcodec/vdpau.h