ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Sat Apr 15 18:36:30 2017 +0200| [d40e181bec22014a9ea312ab6837f7f0bc4f9e42] | committer: Clément Bœsch
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> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d40e181bec22014a9ea312ab6837f7f0bc4f9e42 --- libavcodec/vdpau.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index e85e4d9e9a..855d387d9a 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -50,7 +50,7 @@ */ #include <vdpau/vdpau.h> -#include <vdpau/vdpau_x11.h> + #include "libavutil/avconfig.h" #include "libavutil/attributes.h" ====================================================================== diff --cc libavcodec/vdpau.h index e85e4d9e9a,acd63ccfaf..855d387d9a --- a/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" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
