virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/nvenc: fix double defined GUID on cygwin

Browse Source
This commit is contained in:
Timo Rothenpieler 2017-11-15 19:15:23 +01:00
parent 6fb6170776
commit 15b019e40a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/nvenc/nvEncodeAPI.h
View File

@ -77,7 +77,7 @@ extern "C" {
typedef RECT NVENC_RECT; typedef RECT NVENC_RECT;
#else #else
// ========================================================================================= // =========================================================================================
#ifndef GUID #if !defined(GUID) && !defined(GUID_DEFINED)
/*! /*!
* \struct GUID * \struct GUID
* Abstracts the GUID structure for non-windows platforms. * Abstracts the GUID structure for non-windows platforms.

14
libavcodec/nvenc.h
View File

@ -19,6 +19,13 @@
#ifndef AVCODEC_NVENC_H #ifndef AVCODEC_NVENC_H
#define AVCODEC_NVENC_H #define AVCODEC_NVENC_H
#if CONFIG_D3D11VA
#define COBJMACROS
#include "libavutil/hwcontext_d3d11va.h"
#else
typedef void ID3D11Device;
#endif
#include "compat/nvenc/nvEncodeAPI.h" #include "compat/nvenc/nvEncodeAPI.h"
#include "config.h" #include "config.h"
@ -27,13 +34,6 @@
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#if CONFIG_D3D11VA
#define COBJMACROS
#include "libavutil/hwcontext_d3d11va.h"
#else
typedef void ID3D11Device;
#endif
#include "avcodec.h" #include "avcodec.h"
#define MAX_REGISTERED_FRAMES 64 #define MAX_REGISTERED_FRAMES 64