-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add new feature "ffmpeg" which allows to build "ffmpeg.exe" - ex. : vcpkg install ffmpeg[x264,gpl,nonfree,ffplay,ffprobe,openssl,lzma,opencl,ffmpeg]:x64-windows-static --recurse
- Loading branch information
Showing
5 changed files
with
57 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/cmdutils.c 2017-07-29 19:49:29.000000000 +0200 | ||
+++ b/cmdutils.c 2018-09-02 20:31:42.509408400 +0200 | ||
@@ -62,6 +62,8 @@ | ||
#include <sys/resource.h> | ||
#endif | ||
#ifdef _WIN32 | ||
+#define _WIN32_WINNT 0x0600 | ||
+#define WIN32_LEAN_AND_MEAN | ||
#include <windows.h> | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- a/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 | ||
+++ b/ffmpeg.c 2018-09-02 20:32:27.666725200 +0200 | ||
@@ -23,6 +23,11 @@ | ||
* multimedia converter based on the FFmpeg libraries | ||
*/ | ||
|
||
+#define _WIN32_WINNT 0x0502 // Must be less than 0x0600, because otherwise WinSock2.h defines "pollfd" which then gets redefined in "os_support.h". | ||
+ // I suppose that "HAVE_STRUCT_POLLFD" should be 1, but it happens to be 0. Sorry, this is somewhat beyond me. | ||
+#define WIN32_LEAN_AND_MEAN | ||
+ | ||
+ | ||
#include "config.h" | ||
#include <ctype.h> | ||
#include <string.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
--- a/ffmpeg_dxva2.c 2017-07-29 19:49:29.000000000 +0200 | ||
+++ b/ffmpeg_dxva2.c 2018-09-02 20:33:48.248716100 +0200 | ||
@@ -16,12 +16,14 @@ | ||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
*/ | ||
|
||
-#include <windows.h> | ||
- | ||
#ifdef _WIN32_WINNT | ||
#undef _WIN32_WINNT | ||
#endif | ||
#define _WIN32_WINNT 0x0600 | ||
+#define WIN32_LEAN_AND_MEAN | ||
+ | ||
+#include <windows.h> | ||
+ | ||
#define DXVA2API_USE_BITFIELDS | ||
#define COBJMACROS | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters