Fix include order in VAAPI

You cannot check HAVE_AVCODEC_VAAPI before including "avcodec.h"

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index cb2a39a266f282e00c5463e79476caf67b6666f4..0436bf1b1562c59cffd1e2397e2c4f8d0ab60204 100644 (file)
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -31,9 +31,6 @@
 
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H
 #   include <libavcodec/avcodec.h>
-#   ifdef HAVE_AVCODEC_VAAPI
-#       include <libavcodec/vaapi.h>
-#   endif
 #elif defined(HAVE_FFMPEG_AVCODEC_H)
 #   include <ffmpeg/avcodec.h>
 #else
@@ -45,10 +42,15 @@
 
 #ifdef HAVE_AVCODEC_VAAPI
 
+#if defined( HAVE_LIBAVCODEC_AVCODEC_H )
+#    include <libavcodec/vaapi.h>
+#else
+#    error "Missing VAAPI header"
+#endif
+
 #include <X11/Xlib.h>
 #include <va/va_x11.h>
 
-
 typedef struct
 {
     VASurfaceID  i_id;