Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
15b019e4
Commit
15b019e4
authored
Nov 15, 2017
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/nvenc: fix double defined GUID on cygwin
parent
6fb61707
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
nvEncodeAPI.h
compat/nvenc/nvEncodeAPI.h
+1
-1
nvenc.h
libavcodec/nvenc.h
+7
-7
No files found.
compat/nvenc/nvEncodeAPI.h
View file @
15b019e4
...
@@ -77,7 +77,7 @@ extern "C" {
...
@@ -77,7 +77,7 @@ extern "C" {
typedef
RECT
NVENC_RECT
;
typedef
RECT
NVENC_RECT
;
#else
#else
// =========================================================================================
// =========================================================================================
#if
ndef 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.
...
...
libavcodec/nvenc.h
View file @
15b019e4
...
@@ -19,6 +19,13 @@
...
@@ -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 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment