Commit 59b06294 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Update patchset

parent 92e05856
From 22564b9dc356c2a19a3f2ed25115f3f9e7bfd1e1 Mon Sep 17 00:00:00 2001
From 0d7c06d4d12751f9ce166740905bb465ac1ff7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Feb 2015 11:58:54 +0100
Subject: [PATCH 01/38] wasapi: Don't fail if the client is already initialized
......@@ -9,10 +9,10 @@ make the extra test only for Winstore builds
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index b74c08a317..efa9d573d9 100644
index 9f6d260ccd..fa9eeed116 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -585,7 +585,11 @@ static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict pfmt,
@@ -596,7 +596,11 @@ static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict pfmt,
hr = IAudioClient_Initialize(sys->client, shared_mode, 0, buffer_duration,
0, pwf, sid);
CoTaskMemFree(pwf_closest);
......@@ -26,5 +26,5 @@ index b74c08a317..efa9d573d9 100644
msg_Err(s, "cannot initialize audio client (error 0x%lx)", hr);
goto error;
--
2.17.0.windows.1
2.19.1
From 7acf55ea6a5dae9e9492ff6cda327c03f41c6395 Mon Sep 17 00:00:00 2001
From 29e659e58681894761143c2211e3c02eaad236d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Wed, 11 May 2016 17:37:47 +0200
Subject: [PATCH 02/38] gnutls: Set cannot_unload_broken_library for winrt
......@@ -22,5 +22,5 @@ index 1b214358d4..51a8b5c022 100644
add_submodule ()
set_description( N_("GNU TLS server") )
--
2.17.0.windows.1
2.19.1
From dfaf2d3bc329228e918c437227cb6d7d86f7a01c Mon Sep 17 00:00:00 2001
From b8b7b4b9f9d79083a3aa3ad25b32c87a9c0cab40 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 16 Apr 2014 16:09:53 +0200
Subject: [PATCH 03/38] Cheat for Windows Store subtitles
......@@ -26,5 +26,5 @@ index acbba3a30f..f4e9e2fba3 100644
free( psz_mrl );
}
--
2.17.0.windows.1
2.19.1
From dd6f5b0fb5e77bfec17dfefc98746f33c9ecbd46 Mon Sep 17 00:00:00 2001
From aa1f26b375fc3e5623486f2ac1cbe6d886f6f744 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 12 Mar 2014 00:11:26 +0100
Subject: [PATCH 04/38] Accept the weird WinRT pathes
......@@ -24,5 +24,5 @@ index 44afaba3fa..8e71855cd7 100644
{ /* Windows UNC paths */
/* \\host\share\path -> file://host/share/path */
--
2.17.0.windows.1
2.19.1
From ca9038e919a02830a05f393367adbc6dab9abc7a Mon Sep 17 00:00:00 2001
From f018d49626458eeaf6b438b822aa48f9d1b2ffe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 2 Aug 2016 18:54:28 +0200
Subject: [PATCH 05/38] config: cmdline: Use msg_* instead of fprintf
......@@ -46,5 +46,5 @@ index 535306cc1c..02a88b46d3 100644
}
}
--
2.17.0.windows.1
2.19.1
From 8f571f0a316cab736c65ba1acb0678f9cd896b00 Mon Sep 17 00:00:00 2001
From 16e86f74595c539bbe89b1acfe8b343388d0ab65 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Fri, 30 Sep 2016 09:49:19 +0200
Subject: [PATCH 06/38] plugin cache: Windows doesn't like relative pathes in
......@@ -26,5 +26,5 @@ index 2e67a0d07e..27c5de3924 100644
return;
--
2.17.0.windows.1
2.19.1
From dc4400d11498e4d496ea72a25dde79334a6eb71a Mon Sep 17 00:00:00 2001
From d906240aa3e54bf707f43979409ee97603ec1c72 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <slhomme@matroska.org>
Date: Fri, 2 Dec 2016 11:14:40 +0100
Subject: [PATCH 07/38] TEMPORARY: disable cuda/nvenc when building for
......@@ -22,5 +22,5 @@ index fc68f815a0..92c400d21b 100644
ifeq ($(ARCH),x86_64)
--
2.17.0.windows.1
2.19.1
From aad63a455b7e1508f459e4a80a8a803f05c48f9b Mon Sep 17 00:00:00 2001
From ccc41eef35ee56fc69c014b6908dca8b2ce6bd78 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Wed, 25 Jan 2017 10:49:37 +0100
Subject: [PATCH 08/38] core: avcodec requires 32-bytes memory alignment in
......@@ -16,7 +16,7 @@ replaces https://patches.videolan.org/patch/7971/
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/picture.c b/src/misc/picture.c
index b7eecb4486..aa5321664f 100644
index 9a08255e16..c07cdbca56 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -70,7 +70,7 @@ static int AllocatePicture( picture_t *p_pic )
......@@ -29,5 +29,5 @@ index b7eecb4486..aa5321664f 100644
{
p_pic->i_planes = 0;
--
2.17.0.windows.1
2.19.1
From 90abb43062cdca5a968c7bcc1208079c958c090f Mon Sep 17 00:00:00 2001
From 26a2dc3b5b81b0d9fa494f9ec94c64567fcb2c0f Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:11 +0200
Subject: [PATCH 09/38] contrib: ffmpeg: use bcrypt instead of the old wincrypt
......@@ -89,5 +89,5 @@ index 92c400d21b..9513d63aaf 100644
.ffmpeg: ffmpeg
--
2.17.0.windows.1
2.19.1
From 90e933c30abda8d5da1c4533e95955933fd6d862 Mon Sep 17 00:00:00 2001
From dcfb759a124ca9c06e847895bc516b832045e481 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Tue, 19 Dec 2017 12:39:06 +0100
Subject: [PATCH 10/38] contrib:avcodec: use a more recent FFmpeg version
......@@ -22,5 +22,5 @@ index 9513d63aaf..667648409f 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
FFMPEG_LAVC_MIN := 57.37.100
--
2.17.0.windows.1
2.19.1
From 7080e03520b0d677d850e64846b1d63d791095b9 Mon Sep 17 00:00:00 2001
From b32392292442290d1928d12a62c7b693a5608bfb Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 20 Feb 2018 11:24:43 +0100
Subject: [PATCH 11/38] contrib:mpg123: don't use forbidden APIs on Phone apps
......@@ -39,5 +39,5 @@ index e8f14f6abb..ef0db03a88 100644
$(MOVE)
--
2.17.0.windows.1
2.19.1
From 52334b6ad83e1922d0539fa76e0997ebf68a04a6 Mon Sep 17 00:00:00 2001
From 1083f0b1288994c6d4d2c7d1a12224197fbe35c0 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 12/38] contrib: use live555 version that is compatible with
......@@ -18,7 +18,7 @@ index f459fb9d16..02b2a69734 100644
+10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5 live.2016.10.21.tar.gz
\ No newline at end of file
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index b77d96ce73..3a2526a497 100644
index e4ed5afb07..f99b7968a4 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -37,7 +37,7 @@ index b77d96ce73..3a2526a497 100644
ifeq ($(call need_pkg,"live555"),)
PKGS_FOUND += live555
@@ -82,7 +80,6 @@ endif
@@ -92,7 +90,6 @@ endif
SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
.live555: live555
......@@ -46,5 +46,5 @@ index b77d96ce73..3a2526a497 100644
echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
--
2.17.0.windows.1
2.19.1
From 3c389c8cc82b43ddb549078132568c42dedf8b24 Mon Sep 17 00:00:00 2001
From 1deb44bb6be1214a6b71667a7b92dd7629ee4073 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Tue, 27 Mar 2018 18:57:41 +0200
Subject: [PATCH 13/38] rand: use bcrypt instead of CryptographicBufferStatics
......@@ -12,10 +12,10 @@ The old API is deprecated.
2 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/configure.ac b/configure.ac
index 206690b468..ac2c86147a 100644
index a6ff64595e..c3fab3a304 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1124,7 +1124,10 @@ AH_BOTTOM([
@@ -1138,7 +1138,10 @@ AH_BOTTOM([
dnl Win32 requires linking to ssp for stack-protection
AS_IF([test "${SYS}" = "mingw32"], [
LDFLAGS="${LDFLAGS} -lssp"
......@@ -102,5 +102,5 @@ index 1aeb656a8a..723a32b26e 100644
/* acquire default encryption context */
if( CryptAcquireContext(
--
2.17.0.windows.1
2.19.1
From e9ab598275d2308f030dcac21dc28d6100461ed0 Mon Sep 17 00:00:00 2001
From d5a7f08659e984c58aca22684f6f596f443837b0 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 28 Mar 2018 09:10:39 +0200
Subject: [PATCH 14/38] keystore: CryptUnprotectData is officially found in
......@@ -23,5 +23,5 @@ index 9a7b3876a6..ebbdcfc99f 100644
typedef BOOL (WINAPI *ProcessFunc)(DATA_BLOB*, LPCWSTR, DATA_BLOB*, PVOID,
CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*);
--
2.17.0.windows.1
2.19.1
From eccf7564de0876b31787f69b10fcb0bdb88d5362 Mon Sep 17 00:00:00 2001
From 1709ea70c79853fb6802cf78a225cd7cfd4e51bb Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 23 May 2016 09:18:17 +0200
Subject: [PATCH 15/38] contrib: gnutls: fix Winstore forbidden API calls
......@@ -10,7 +10,7 @@ Subject: [PATCH 15/38] contrib: gnutls: fix Winstore forbidden API calls
create mode 100644 contrib/src/gnutls/winstore.patch
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index c8454d4d13..78941c18ec 100644
index 546561fe6a..a721840cd2 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -37,6 +37,9 @@ ifdef HAVE_MACOSX
......@@ -462,5 +462,5 @@ index 0000000000..d59863d000
+ hCertStore,
+ PCCRL_CONTEXT
--
2.17.0.windows.1
2.19.1
From cbdb93b4fccac472e5cb7cb7854c0e08f078561d Mon Sep 17 00:00:00 2001
From 5c443e28373d1921ad66d0d017eb637e4eb14230 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 13:09:59 +0200
Subject: [PATCH 16/38] sap: use the same declaration signature as the
......@@ -22,5 +22,5 @@ index ee5312eb7d..2b5b0e13a2 100644
static sap_address_t *AddressCreate (vlc_object_t *obj, const char *group)
{
--
2.17.0.windows.1
2.19.1
From 204439a7ec0392e4cf559c198a839b308c249516 Mon Sep 17 00:00:00 2001
From a42147ec973921e8c597747bb4db3ccfbc62f650 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:00:53 +0200
Subject: [PATCH 17/38] contrib: shout: respect the availability of strings.h
everywhere
---
contrib/src/shout/rules.mak | 1 +
contrib/src/shout/rules.mak | 2 ++
contrib/src/shout/shout-strings.patch | 36 +++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
2 files changed, 38 insertions(+)
create mode 100644 contrib/src/shout/shout-strings.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 500420cbe2..ac34c59a29 100644
index fedff47b56..c4a1c15fab 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -23,6 +23,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/bsd.patch
@@ -24,6 +24,8 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/no-examples.patch
+ $(APPLY) $(SRC)/shout/shout-strings.patch
$(call pkg_static,"shout.pc.in")
+ $(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
diff --git a/contrib/src/shout/shout-strings.patch b/contrib/src/shout/shout-strings.patch
new file mode 100644
index 0000000000..438a364899
......@@ -65,5 +66,5 @@ index 0000000000..438a364899
+
+ #include <shout/shout.h>
--
2.17.0.windows.1
2.19.1
From 9641e7f6e0ae242dd767d45d800483ecf22d02dc Mon Sep 17 00:00:00 2001
From b77231d241e26637e448ec690ca6bdc2c01d8daa Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:03:37 +0200
Subject: [PATCH 18/38] contrib: shout: usleep() is not a Windows API
......@@ -10,12 +10,12 @@ Subject: [PATCH 18/38] contrib: shout: usleep() is not a Windows API
create mode 100644 contrib/src/shout/shout-win32.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index ac34c59a29..5ee5e7da9c 100644
index c4a1c15fab..a61550f9b7 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -24,6 +24,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/libshout-arpa.patch
@@ -25,6 +25,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/no-examples.patch
$(APPLY) $(SRC)/shout/shout-strings.patch
+ $(APPLY) $(SRC)/shout/shout-win32.patch
$(call pkg_static,"shout.pc.in")
......@@ -42,5 +42,5 @@ index 0000000000..f29926ef1d
+ }
+
--
2.17.0.windows.1
2.19.1
From d5322cdd0cb0a0e8bc4e28c9c94d97f455367375 Mon Sep 17 00:00:00 2001
From 77a50e469e3deaa3a2688331f5ad3fb8a45dd8ee Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:06:53 +0200
Subject: [PATCH 19/38] contrib: shout: timeval is defined in winsock2.h on
......@@ -11,11 +11,11 @@ Subject: [PATCH 19/38] contrib: shout: timeval is defined in winsock2.h on
create mode 100644 contrib/src/shout/shout-timeval.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 5ee5e7da9c..afd75f1d74 100644
index a61550f9b7..4d6df0e11d 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -25,6 +25,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
@@ -26,6 +26,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/no-examples.patch
$(APPLY) $(SRC)/shout/shout-strings.patch
$(APPLY) $(SRC)/shout/shout-win32.patch
+ $(APPLY) $(SRC)/shout/shout-timeval.patch
......@@ -39,5 +39,5 @@ index 0000000000..6d05058446
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
--
2.17.0.windows.1
2.19.1
From 6f33ae0f5a4385278955fe7c28b19bf1c9fc8f52 Mon Sep 17 00:00:00 2001
From 4e13ca7990fc3e8a02cc161758d8bfa79ec03cdf Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:13:55 +0200
Subject: [PATCH 20/38] contrib: shout: socklen_t can be found in ws2tcpip.h on
......@@ -12,10 +12,10 @@ and make sure it's found on Windows Store builds as well
create mode 100644 contrib/src/shout/shout-win32-socklen.patch
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index afd75f1d74..90cd2b565d 100644
index 4d6df0e11d..830ce1f98e 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -26,6 +26,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
@@ -27,6 +27,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(APPLY) $(SRC)/shout/shout-strings.patch
$(APPLY) $(SRC)/shout/shout-win32.patch
$(APPLY) $(SRC)/shout/shout-timeval.patch
......@@ -42,5 +42,5 @@ index 0000000000..57821bff90
+
+ #include "sock.h"
--
2.17.0.windows.1
2.19.1
From 8a663623d792e23ff8cb417cb88cb900b1f438ab Mon Sep 17 00:00:00 2001
From 9e6afceace5934fcd54cdf216975e86f9ac8d386 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 29 Mar 2018 15:46:50 +0200
Subject: [PATCH 21/38] contrib: ffmpeg: don't use libvpx at all in libavcodec
......@@ -35,5 +35,5 @@ index 667648409f..ea288c7284 100644
FFMPEGCONF += --disable-encoders --disable-muxers
endif
--
2.17.0.windows.1
2.19.1
From 07fe4a1e8214d89d78f3c81a6287b7ae5e0d517b Mon Sep 17 00:00:00 2001
From 26d0395a323b29bbf1f0c2ef6c82407fc48ce99a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 13:29:40 +0200
Subject: [PATCH 22/38] contrib: gcrypt: use bcrypt rather than wincrypt
......@@ -316,5 +316,5 @@ index fdceb26fea..6c02a407ce 100644
addedFixedItems = 1;
}
--
2.17.0.windows.1
2.19.1
From 12a3b6b0e5924f20a34737d9d2a7d487c60b3d1c Mon Sep 17 00:00:00 2001
From bf81fd0f7d6ae952976547840073c7bcf9ee9a5d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 14:49:26 +0200
Subject: [PATCH 23/38] contrib: libarchive: use bcrypt rather than wincrypt
......@@ -90,5 +90,5 @@ index aced4db253..befacd4279 100644
endif
$(APPLY) $(SRC)/libarchive/fix-types.patch
--
2.17.0.windows.1
2.19.1
From 639a2ca65bc3a992819ec1833e4788e147201ac7 Mon Sep 17 00:00:00 2001
From 4f956ba28a5c0ddc0d47647f87b5d275d487b5c0 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 4 Apr 2018 12:10:17 +0200
Subject: [PATCH 24/38] transcode: do not include the decoder padding in the
......@@ -9,10 +9,10 @@ Subject: [PATCH 24/38] transcode: do not include the decoder padding in the
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 779ff7c6eb..74734ee656 100644
index b6fabead48..7849e379b2 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -570,8 +570,10 @@ static void transcode_video_sar_init( sout_stream_t *p_stream,
@@ -572,8 +572,10 @@ static void transcode_video_sar_init( sout_stream_t *p_stream,
{
vlc_ureduce( &id->p_encoder->fmt_out.video.i_sar_num,
&id->p_encoder->fmt_out.video.i_sar_den,
......@@ -26,5 +26,5 @@ index 779ff7c6eb..74734ee656 100644
}
else
--
2.17.0.windows.1
2.19.1
From 4e2ae46e2434c131fdd1dd06ca4749f8fd64a5c2 Mon Sep 17 00:00:00 2001
From 4080a898c2d19cb587dec0d001153dca23bedfb1 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 14 Dec 2017 14:20:25 +0100
Subject: [PATCH 25/38] transcode: the visible dimensions are unlikely to be 0
......@@ -8,7 +8,7 @@ Subject: [PATCH 25/38] transcode: the visible dimensions are unlikely to be 0
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 74734ee656..13df03c855 100644
index 7849e379b2..c0a0b26275 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -439,9 +439,9 @@ static void transcode_video_size_init( sout_stream_t *p_stream,
......@@ -24,5 +24,5 @@ index 74734ee656..13df03c855 100644
--
2.17.0.windows.1
2.19.1
From 607e59cc2456d9d561d2974bbaa5586871f6ddaa Mon Sep 17 00:00:00 2001
From 77177dcbd99487abb0f002d769e959af818b9ac6 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Mon, 4 Sep 2017 13:59:25 +0200
Subject: [PATCH 26/38] codec: add a set of functions to use a plain FIFO
......@@ -141,5 +141,5 @@ index 0000000000..49a99b454f
+
+#endif /* VLC_FIFO_HELPER_H */
--
2.17.0.windows.1
2.19.1
From bc029f5cdab65417fdebbd01b2e04b17e7663085 Mon Sep 17 00:00:00 2001
From 924a83e43dd7e80eb6fc8259b473e7121856843d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@videolabs.io>
Date: Thu, 31 Aug 2017 18:02:31 +0200
Subject: [PATCH 27/38] qsv: CUMULATIVE PATCH to encode from CPU planes
......@@ -10,10 +10,10 @@ Subject: [PATCH 27/38] qsv: CUMULATIVE PATCH to encode from CPU planes
2 files changed, 294 insertions(+), 163 deletions(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 10132a92f3..c42f40e5cd 100644
index 9bbc5f2877..2d2dbe2b64 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -595,7 +595,7 @@ libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
@@ -598,7 +598,7 @@ libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd)
EXTRA_LTLIBRARIES += libcrystalhd_plugin.la
codec_LTLIBRARIES += $(LTLIBcrystalhd)
......@@ -738,5 +738,5 @@ index 93752e792e..0f865dd4ab 100644
return block;
}
--
2.17.0.windows.1
2.19.1
From ede6e153a32002057341cbe24bbf9c78f5c41a99 Mon Sep 17 00:00:00 2001
From 6058a06875053c9f4512c48abd62dda5e2db7b0b Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 5 Apr 2018 09:49:44 +0200
Subject: [PATCH 28/38] chromecast: try to encode with QSV if possible
......@@ -9,10 +9,10 @@ It will be handled by the GPU so use less resource.
1 file changed, 40 insertions(+)
diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index b330b70297..ec6218ae6b 100644
index 53227c258b..2210d1d46c 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -916,6 +916,45 @@ static std::string GetVencVPXOption( sout_stream_t * /* p_stream */,
@@ -914,6 +914,45 @@ static std::string GetVencVPXOption( sout_stream_t * /* p_stream */,
return "venc=vpx{quality-mode=1}";
}
......@@ -58,7 +58,7 @@ index b330b70297..ec6218ae6b 100644
static std::string GetVencX264Option( sout_stream_t * /* p_stream */,
const video_format_t *p_vid,
int i_quality )
@@ -962,6 +1001,7 @@ static struct
@@ -960,6 +999,7 @@ static struct
vlc_fourcc_t fcc;
std::string (*get_opt)( sout_stream_t *, const video_format_t *, int);
} venc_opt_list[] = {
......@@ -67,5 +67,5 @@ index b330b70297..ec6218ae6b 100644
{ .fcc = VLC_CODEC_VP8, .get_opt = GetVencVPXOption },
{ .fcc = VLC_CODEC_H264, .get_opt = NULL },
--
2.17.0.windows.1
2.19.1
From 01632d099bc2a8b5675262d6c3090e3543e114da Mon Sep 17 00:00:00 2001
From 6ff33bedd7a31b74f5aed97bfdda9552a79e5835 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Sun, 8 Apr 2018 15:29:38 +0200
Subject: [PATCH 29/38] contrib: libarchive: fix building with bcrypt.h on UNIX
......@@ -41,5 +41,5 @@ index befacd4279..91515920f1 100644
$(APPLY) $(SRC)/libarchive/no-windows-files.patch
$(APPLY) $(SRC)/libarchive/libarchive-win32-bcrypt.patch
--
2.17.0.windows.1
2.19.1
From 940d4469b836659fb5fb97642499a5f46e2f6a38 Mon Sep 17 00:00:00 2001
From 3f3e35e0cef6022c25d003a920eeafea23fee7d8 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 09:59:27 +0200
Subject: [PATCH 30/38] contrib: libarchive: Fix winrt build
......@@ -60,5 +60,5 @@ index 50258dfe91..6dbc3c86d2 100644
+ DebugBreak();
+ #endif
--
2.17.0.windows.1
2.19.1
From 30d6dfa33ba9affc7d1851e940b084e3c93de56d Mon Sep 17 00:00:00 2001
From 0a75cbe32afce5a568c30433b9d2d50a515c0fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 9 Apr 2018 13:04:02 +0200
Subject: [PATCH 31/38] contribs: Fix ffmpeg build with gcrypt.h
......@@ -28,5 +28,5 @@ index 456557716d..ff5ad0f9a4 100644
+ #elif HAVE_WINCRYPT
+ #include <windows.h>
--
2.17.0.windows.1
2.19.1
From 79acf1e985df60a5b95f78c38304aae87ebf1578 Mon Sep 17 00:00:00 2001
From d43f311d6d1e45aa2650ae5c1e79125474dd6823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 9 Apr 2018 13:25:00 +0200
Subject: [PATCH 32/38] contribs: Fix gnutls UWP build with mingw-w64
......@@ -36,5 +36,5 @@ index d59863d000..68e4b3c609 100644
+
+ #include <winapifamily.h>
--
2.17.0.windows.1
2.19.1
From ad5be45bc8e018a8de1f40255eba5864622e0ca9 Mon Sep 17 00:00:00 2001
From 635130b149aaa8e4233ee3d6122c208b479b467d Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 9 Apr 2018 18:46:34 +0200
Subject: [PATCH 33/38] win32: fix crash on closesocket() when a poll() is
......@@ -30,5 +30,5 @@ index 8d56cc859a..bb1ad12985 100644
}
--
2.17.0.windows.1
2.19.1
From 94b08c2e28c370c83407af2871d24b086022a9b1 Mon Sep 17 00:00:00 2001
From 02558b57d16eb1730342c92c2be79787fa4b7970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:14:25 +0200
Subject: [PATCH 34/38] contrib: ffmpeg: Don't check for wincrypt anymore
......@@ -56,5 +56,5 @@ index ea288c7284..c61b0d6969 100644
.ffmpeg: ffmpeg
--
2.17.0.windows.1
2.19.1
From b43077d9bebb3545fc428f55d6491bb826050df8 Mon Sep 17 00:00:00 2001
From ca27fc0ffe649cf83cca139bd1cbe6be61022946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 15:58:44 +0200
Subject: [PATCH 35/38] contrib: gnutls: Use winstorecompat overload when
......@@ -35,5 +35,5 @@ index 68e4b3c609..6d7210b154 100644
+
+ #include "gnutls_int.h"
--
2.17.0.windows.1
2.19.1
From 7a7c996e94c7b6fc84931615c9bd53db4975c03c Mon Sep 17 00:00:00 2001
From 3316248b96d6fd9980daa260c533dca60e23e226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 10 Apr 2018 17:14:15 +0200
Subject: [PATCH 36/38] contrib: mpg123: Simplify unicode checks
......@@ -62,5 +62,5 @@ index 416faeaba9..3171e1c5fc 100644
+ fi
+ else
--
2.17.0.windows.1
2.19.1
From 039e04de5634b07c2d328e9f19c05077151def3e Mon Sep 17 00:00:00 2001
From e52a2a08384c525627b67e4bfefe5ff16c15de14 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Wed, 18 Apr 2018 14:19:56 +0200
Subject: [PATCH 37/38] direct3d11: get the feature level from the external
......@@ -9,10 +9,10 @@ Subject: [PATCH 37/38] direct3d11: get the feature level from the external
1 file changed, 1 insertion(+)
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index ca9d2bf314..d0f5a4ba7b 100644
index 4b29daab41..3f401ed1a4 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -471,6 +471,7 @@ static int OpenCoreW(vout_display_t *vd)
@@ -210,6 +210,7 @@ static int OpenCoreW(vout_display_t *vd)
sys->dxgiswapChain = dxgiswapChain;
sys->d3d_dev.d3ddevice = d3ddevice;
sys->d3d_dev.d3dcontext = d3dcontext;
......@@ -21,5 +21,5 @@ index ca9d2bf314..d0f5a4ba7b 100644
ID3D11Device_AddRef (sys->d3d_dev.d3ddevice);
ID3D11DeviceContext_AddRef(sys->d3d_dev.d3dcontext);
--
2.17.0.windows.1
2.19.1
From 31edd7b0d88c3fbfada456478cfabf9b7ab069c2 Mon Sep 17 00:00:00 2001
From c970419f597106898aa8d31f91d1202b4dff6cf2 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Thu, 24 May 2018 15:17:02 +0200
Subject: [PATCH 38/38] contrib: harfbuzz: don't build tests on winstore builds
......@@ -47,5 +47,5 @@ index c8695afdae..446a926566 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.17.0.windows.1
2.19.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment