d3d11va: fix config test error

libavcodec/d3d11va.h includes d3d11.h as c. so must include d3d11.h first. g c 11 is required to use ComPtr, so g 4.x will not build d3d11va by default
SmartElec · Mar 31, 2016 · a45d666 · a45d666
1 parent eed799b
commit a45d666
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/config.tests/d3d11va/main.cpp b/config.tests/d3d11va/main.cpp
@@ -18,11  18,11 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
-
 #include <d3d11.h>
 extern "C" {
 #include <libavcodec/d3d11va.h> 
 }
-#include <wrl/client.h>
 #include <wrl/client.h> //ComPtr is used in QtAV
 
 
 int main()

diff --git a/src/codec/video/VideoDecoderD3D11.cpp b/src/codec/video/VideoDecoderD3D11.cpp
@@ -18,18  18,17 @@
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
-
 #include "VideoDecoderD3D.h"
 #include "QtAV/private/factory.h"
 #include "QtAV/private/mkid.h"
 #define DX_LOG_COMPONENT "D3D11VA"
 #include "utils/DirectXHelper.h"
 #include <initguid.h> //IID_ID3D11VideoContext
 #include <d3d11.h> //include before <libavcodec/d3d11va.h> because d3d11va.h also includes d3d11.h but as a c header (for msvc)
 #include <wrl/client.h>
 extern "C" {
 #include <libavcodec/d3d11va.h>
 }
-#include <d3d11.h>
-#include <wrl/client.h>
 using namespace Microsoft::WRL; //ComPtr
 #include <initguid.h> /* must be last included to not redefine existing GUIDs */