aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXidorn Quan <quanxunzhen@gmail.com>2012-10-26 14:40:04 +0800
committerMichael Niedermayer <michaelni@gmx.at>2012-10-27 04:32:40 +0200
commitc25e9292ba5b5d4f2ba52004d3593a1dafdfe427 (patch)
tree17db2155891cc902e460a9d1931acecec8ab079b
parent1909dbf11da01f4493d9183622ef9feb3632257e (diff)
downloadffmpeg-c25e9292ba5b5d4f2ba52004d3593a1dafdfe427.tar.gz
fix a compiling error with llvm-gcc
Move some #include in vda.h down to prevent libavutil headers from interfering with system headers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vda.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index ccbf3752cf..de7070edea 100644
--- a/libavcodec/vda.h
+++ b/libavcodec/vda.h
@@ -29,12 +29,6 @@
* Public libavcodec VDA header.
*/
-#include "libavcodec/version.h"
-
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
#include <stdint.h>
// emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -45,6 +39,12 @@
#include <VideoDecodeAcceleration/VDADecoder.h>
#undef Picture
+#include "libavcodec/version.h"
+
+#if FF_API_VDA_ASYNC
+#include <pthread.h>
+#endif
+
/**
* @defgroup lavc_codec_hwaccel_vda VDA
* @ingroup lavc_codec_hwaccel