[FFmpeg-cvslog] fix a compiling error with llvm-gcc

Xidorn Quan git at videolan.org
Sat Oct 27 04:34:18 CEST 2012


ffmpeg | branch: master | Xidorn Quan <quanxunzhen at gmail.com> | Fri Oct 26 14:40:04 2012 +0800| [c25e9292ba5b5d4f2ba52004d3593a1dafdfe427] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c25e9292ba5b5d4f2ba52004d3593a1dafdfe427
---

 libavcodec/vda.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vda.h b/libavcodec/vda.h
index ccbf375..de7070e 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



More information about the ffmpeg-cvslog mailing list