qsvdec: do not sync PIX_FMT_QSV surfaces

[ffmpeg] / libavcodec / dxva2.h

diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index d161eb9f5ea76b60dd83607263366b872449e384..d940b47fe58792d717ed791d53edd39f968dbd40 100644 (file)
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
+#ifndef AVCODEC_DXVA2_H
+#define AVCODEC_DXVA2_H
 
 /**
  * @file
@@ -29,7 +29,11 @@
  * Public libavcodec DXVA2 header.
  */
 
-#define _WIN32_WINNT 0x0600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+#endif
+
 #include <stdint.h>
 #include <d3d9.h>
 #include <dxva2api.h>
@@ -42,6 +46,7 @@
  */
 
 #define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
+#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO    2 ///< Work around for DXVA2 and old Intel GPUs with ClearVideo interface
 
 /**
  * This structure is used to provides the necessary configurations and data
@@ -85,4 +90,4 @@ struct dxva_context {
  * @}
  */
 
-#endif /* AVCODEC_DXVA_H */
+#endif /* AVCODEC_DXVA2_H */