lavf/qsvvpp: bypass vpp if not needed.

[ffmpeg] / libavcodec / dxva2.h

diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index 6f08a84044434c1c2992b1b7cab28399fcede9dc..d940b47fe58792d717ed791d53edd39f968dbd40 100644 (file)
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@@ -20,13 +20,34 @@
  * 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
 
-#include <stdint.h>
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_dxva2
+ * Public libavcodec DXVA2 header.
+ */
+
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+#endif
 
+#include <stdint.h>
+#include <d3d9.h>
 #include <dxva2api.h>
 
+/**
+ * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
+
+#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
  * to the DXVA2 Libav HWAccel implementation.
@@ -60,9 +81,13 @@ struct dxva_context {
     uint64_t workaround;
 
     /**
-     * Private to the FFmpeg AVHWAccel implementation
+     * Private to the Libav AVHWAccel implementation
      */
     unsigned report_id;
 };
 
-#endif /* AVCODEC_DXVA_H */
+/**
+ * @}
+ */
+
+#endif /* AVCODEC_DXVA2_H */