Commit ed3980ef authored by Felix Paul Kühne's avatar Felix Paul Kühne

libvlc: update to 3.0 HEAD and enable VideoToolbox in FFmpeg

parent 6ab838a6
From f01a21b2a6ddeceabeb1b4e54ac74fad42b70215 Mon Sep 17 00:00:00 2001
From bf0d5caa93ac201c2bcb677695528e20d1ff819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 03/15] arm_neon: work-around libtool issue
Subject: [PATCH 01/16] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index db81ec0b84..e67e07e61c 100644
index 10f5c15d7c..0406ded7eb 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,3 +1,5 @@
......@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.15.1
2.17.0
From 578973507783bb5fc030559e932e41361b241802 Mon Sep 17 00:00:00 2001
From b1249111d6b1bab21b7d582725bedc0056e8e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/15] disable neon volume plugin
Subject: [PATCH 02/16] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index e67e07e61c..690975235f 100644
index 0406ded7eb..48aa33332b 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -27,6 +27,5 @@ libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
@@ -27,7 +27,6 @@ libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
if HAVE_NEON
neon_LTLIBRARIES = \
libchroma_yuv_neon_plugin.la \
- libvolume_neon_plugin.la \
libyuv_rgb_neon_plugin.la
endif
--
2.15.1
2.17.0
From 537532411de986ae47410c2670d37b6044241f80 Mon Sep 17 00:00:00 2001
From d0d45db08b289da11a23529be31a50249438ebe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 06/15] Enable System DL
Subject: [PATCH 03/16] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......@@ -36,10 +36,10 @@ index 0000000000..2d60cf7140
+ in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
+ in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index e99d9dfb7c..16217f1285 100644
index fc68f815a0..4d2d716146 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -25,6 +25,9 @@ FFMPEGCONF = \
@@ -27,6 +27,9 @@ FFMPEGCONF = \
--disable-encoder=vorbis \
--disable-decoder=opus \
--enable-libgsm \
......@@ -49,7 +49,7 @@ index e99d9dfb7c..16217f1285 100644
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -235,6 +238,7 @@ endif
@@ -241,6 +244,7 @@ endif
ifdef USE_LIBAV
$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
endif
......@@ -58,5 +58,5 @@ index e99d9dfb7c..16217f1285 100644
.ffmpeg: ffmpeg
--
2.15.1
2.17.0
From 4b8743bcf22bd35d4c1fb3ecf6c2ad2a3f4fbb42 Mon Sep 17 00:00:00 2001
From 40a342d3c387a8ab0828ded1b454fefb5d562750 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 08/15] http: add vlc_http_cookies_clear
Subject: [PATCH 04/16] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......@@ -61,5 +61,5 @@ index 77ab852b15..f229b85dea 100644
}
--
2.15.1
2.17.0
From 2ed0f231c6665b39e914bee1130f0efabb0ed9e2 Mon Sep 17 00:00:00 2001
From 1423905fab5b6cb918dcf858cfad1a29bbd3c7fe Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 09/15] libvlc_media: add cookie_jar API
Subject: [PATCH 05/16] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -58,10 +58,10 @@ index 383f366b69..2a5666688d 100644
# ifdef __cplusplus
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 7c7fea02e6..9dbf0efa4e 100644
index 482d95f6f1..8ae5da8d0f 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -218,6 +218,8 @@ libvlc_media_set_user_data
@@ -217,6 +217,8 @@ libvlc_media_set_user_data
libvlc_media_subitems
libvlc_media_tracks_get
libvlc_media_tracks_release
......@@ -138,10 +138,10 @@ index 5a67e9ff60..0f0341e260 100644
/* Media Descriptor */
diff --git a/lib/media_player.c b/lib/media_player.c
index 3d159f7123..ae72bb2b95 100644
index a9a22fee15..fde008aaeb 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -621,6 +621,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
var_Create (mp, "sout", VLC_VAR_STRING);
var_Create (mp, "demux-filter", VLC_VAR_STRING);
......@@ -149,7 +149,7 @@ index 3d159f7123..ae72bb2b95 100644
/* Video */
var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
@@ -968,6 +969,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
@@ -985,6 +986,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
for( size_t i = 0; i < ARRAY_SIZE( p_mi->selected_es ); ++i )
p_mi->selected_es[i] = ES_INIT;
......@@ -163,5 +163,5 @@ index 3d159f7123..ae72bb2b95 100644
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
--
2.15.1
2.17.0
From 43681d842ba377f6a4eff434d5bd5d81775fce7f Mon Sep 17 00:00:00 2001
From 253c0dc57a8235ca46c4e3d296f07a4eb8f8b321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 7 Dec 2014 20:02:18 +0100
Subject: [PATCH 10/15] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 06/16] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
.../gcrypt/work-around-libtool-limitation.patch | 25 ++++++++++++++++++++++
contrib/src/gcrypt/rules.mak | 1 +
.../work-around-libtool-limitation.patch | 25 +++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index eff80415a1..c2d4b934f4 100644
index eb1debac1b..bc938e585f 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
......@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.15.1
2.17.0
From b15a3081c13c1f7487695292905e80fec4708ec6 Mon Sep 17 00:00:00 2001
From 8c3cf7190356202d02c8f6fa1f1aadbc4921754e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sat, 3 Oct 2015 22:45:14 +0200
Subject: [PATCH 11/15] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 07/16] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
contrib/src/gcrypt/rules.mak | 6 ++++++
.../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
contrib/src/gcrypt/rules.mak | 6 ++++++
2 files changed, 22 insertions(+)
create mode 100644 contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
......@@ -32,7 +32,7 @@ index 0000000000..f1d3ccc71f
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index c2d4b934f4..dbd556be61 100644
index bc938e585f..3564fde87b 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
......@@ -43,7 +43,7 @@ index c2d4b934f4..dbd556be61 100644
$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gcrypt/winrt.patch
@@ -43,6 +44,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
@@ -45,6 +46,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
else
GCRYPT_EXTRA_CFLAGS =
endif
......@@ -56,5 +56,5 @@ index c2d4b934f4..dbd556be61 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.15.1
2.17.0
From be3c74bb2d7ab28e21f4c8270392f553579ff867 Mon Sep 17 00:00:00 2001
From 437a1ada2f9b0f658e7766900e11f0f4e30e56d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 12 Sep 2016 17:03:37 +0200
Subject: [PATCH 12/15] contrib/gcrypt: update patches
Subject: [PATCH 08/16] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
.../gcrypt/work-around-libtool-limitation.patch | 16 +-
.../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 +++++++++++++++++-
.../work-around-libtool-limitation.patch | 16 +-
2 files changed, 310 insertions(+), 14 deletions(-)
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
......@@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.15.1
2.17.0
From 823adc6b13806e57deb4f6fc5c3e3a2d1869a8e9 Mon Sep 17 00:00:00 2001
From 7e3d899a9ff37444414f7d337bd0122abb572ef5 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 13/15] Replace thread local with pthread TSD
Subject: [PATCH 09/16] Replace thread local with pthread TSD
---
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/misc/variables.c | 19 +++++++++++++++++
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
src/misc/variables.c | 19 ++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
......@@ -222,5 +222,5 @@ index 810c8ffc81..3d2d2f1dc8 100644
twalk(priv->var_root, TwalkGetNames);
vlc_mutex_unlock(&priv->var_lock);
--
2.15.1
2.17.0
From 029a086e198a74d3494ff6e37feb514aaeb70c41 Mon Sep 17 00:00:00 2001
From 76b00818f5fa5c1722dd860e1f5313cb8181b407 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 14/15] contrib: use live555 version that is compatible with
Subject: [PATCH 10/16] contrib: use live555 version that is compatible with
LGPL2
---
......@@ -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 a2ef4f842c..5b0cbeb1d9 100644
index b77d96ce73..3a2526a497 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
......@@ -46,5 +46,5 @@ index a2ef4f842c..5b0cbeb1d9 100644
echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
--
2.11.0
2.17.0
From 6e30c889b7859c4255e59763433e05c7793c864e Mon Sep 17 00:00:00 2001
From 8dc06538a8a482684420194db68bcda4e6a8dc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sun, 17 Dec 2017 18:05:40 +0100
Subject: [PATCH 15/15] libvlc: add a basic API to change freetype's color,
Subject: [PATCH 11/16] libvlc: add a basic API to change freetype's color,
bold, font and size variables on-the-fly
---
include/vlc/libvlc_media_player.h | 26 ++++++++++++
lib/libvlc.sym | 6 +++
lib/media_player.c | 6 +++
lib/video.c | 69 ++++++++++++++++++++++++++++++-
modules/text_renderer/freetype/freetype.c | 31 ++++++++++++--
include/vlc/libvlc_media_player.h | 26 +++++++++
lib/libvlc.sym | 6 ++
lib/media_player.c | 6 ++
lib/video.c | 69 ++++++++++++++++++++++-
modules/text_renderer/freetype/freetype.c | 31 ++++++++--
5 files changed, 133 insertions(+), 5 deletions(-)
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
......@@ -50,10 +50,10 @@ index 4336df9442..20b220448b 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 7c7fea02e6..2084cc62c2 100644
index 8ae5da8d0f..55f6400f69 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -259,6 +259,9 @@ libvlc_video_get_spu_count
@@ -262,6 +262,9 @@ libvlc_video_get_spu_count
libvlc_video_get_spu_delay
libvlc_video_get_spu_description
libvlc_video_get_teletext
......@@ -63,7 +63,7 @@ index 7c7fea02e6..2084cc62c2 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -283,6 +286,9 @@ libvlc_video_set_spu
@@ -286,6 +289,9 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......@@ -74,10 +74,10 @@ index 7c7fea02e6..2084cc62c2 100644
libvlc_video_take_snapshot
libvlc_video_new_viewpoint
diff --git a/lib/media_player.c b/lib/media_player.c
index a9a22fee15..90d59c014a 100644
index fde008aaeb..7b4050164f 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -694,6 +694,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
@@ -695,6 +695,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
......@@ -182,10 +182,10 @@ index acbba3a30f..035cc0ebf1 100644
+ return get_string( p_mi, "freetype", textrenderer_option_bynumber(option) );
+}
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 2595ef3872..0da1be9ede 100644
index 53cf99cd18..822aae9905 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -943,12 +943,35 @@ static inline int RenderAXYZ( filter_t *p_filter,
@@ -952,12 +952,35 @@ static inline int RenderAXYZ( filter_t *p_filter,
static void UpdateDefaultLiveStyles( filter_t *p_filter )
{
......@@ -226,5 +226,5 @@ index 2595ef3872..0da1be9ede 100644
static void FillDefaultStyles( filter_t *p_filter )
--
2.15.1
2.17.0
From 4579acfee3d2479e1c849c5124f539bbb831262b Mon Sep 17 00:00:00 2001
From e1106f9c6599da8b3c35752af42c935f98c0e895 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 23 Feb 2018 13:16:41 +0100
Subject: [PATCH] Work around lack of __thread storage qualifier on old macOS
Subject: [PATCH 12/16] Work around lack of __thread storage qualifier on old
macOS
---
configure.ac | 4 +--
include/vlc_fixups.h | 7 ++--
configure.ac | 4 +-
include/vlc_fixups.h | 7 +++-
po/POTFILES.in | 1 +
src/Makefile.am | 1 +
{compat => src/extras}/tdestroy.c | 67 +++++++++++++++++++++++----------------
{compat => src/extras}/tdestroy.c | 67 ++++++++++++++++++-------------
5 files changed, 48 insertions(+), 32 deletions(-)
rename {compat => src/extras}/tdestroy.c (59%)
diff --git a/configure.ac b/configure.ac
index 225bcae987..c5d7a41063 100644
index 206690b468..78583f37e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -590,8 +590,8 @@ dnl Check for system libs needed
......@@ -203,5 +204,5 @@ index 6bb3480957..5c54881553 100644
+
+#endif
--
2.14.3 (Apple Git-98)
2.17.0
From ca68f8644cfe31ffa697de49d1406fe6b645b978 Mon Sep 17 00:00:00 2001
From b281c9b5d94754dd93f0406943171b3ca24b781d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 26 Mar 2018 16:44:44 +0200
Subject: [PATCH] modules:common: Use the full module name as MODULE_NAME
Subject: [PATCH 13/16] modules:common: Use the full module name as MODULE_NAME
This avoid conflicts when linking modules staticly on platforms that don't
have objdump
......@@ -29,5 +29,5 @@ index 1b9117c98d..fc67a39bca 100644
AM_CFLAGS =
AM_CXXFLAGS =
--
2.15.1 (Apple Git-101)
2.17.0
From 9f44e0b6609cc396429b309dfeded220cf769068 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Mon, 30 Apr 2018 14:33:08 +0100
Subject: [PATCH 14/16] add auto deinterlacer-mode which is also valid
---
lib/video.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/video.c b/lib/video.c
index 035cc0ebf1..a3e5b248e9 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -675,7 +675,8 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
&& strcmp (psz_mode, "discard") && strcmp (psz_mode, "linear")
&& strcmp (psz_mode, "mean") && strcmp (psz_mode, "x")
&& strcmp (psz_mode, "yadif") && strcmp (psz_mode, "yadif2x")
- && strcmp (psz_mode, "phosphor") && strcmp (psz_mode, "ivtc"))
+ && strcmp (psz_mode, "phosphor") && strcmp (psz_mode, "ivtc")
+ && strcmp (psz_mode, "auto"))
return;
if (*psz_mode)
--
2.17.0
From 4ae5821be54655e3a029ef1b5bc0e3bc03085ee6 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Mon, 30 Apr 2018 14:33:08 +0100
Subject: [PATCH 1/2] add auto deinterlacer-mode which is also valid
---
lib/video.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/video.c b/lib/video.c
index 035cc0ebf1..a3e5b248e9 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -675,7 +675,8 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
&& strcmp (psz_mode, "discard") && strcmp (psz_mode, "linear")
&& strcmp (psz_mode, "mean") && strcmp (psz_mode, "x")
&& strcmp (psz_mode, "yadif") && strcmp (psz_mode, "yadif2x")
- && strcmp (psz_mode, "phosphor") && strcmp (psz_mode, "ivtc"))
+ && strcmp (psz_mode, "phosphor") && strcmp (psz_mode, "ivtc")
+ && strcmp (psz_mode, "auto"))
return;
if (*psz_mode)
--
2.15.1 (Apple Git-101)
From bc236ea6a0c7c057883f2251d331cecdd40d6ec7 Mon Sep 17 00:00:00 2001
From 1739ea67d1a2df1d51456d37e4cfc25dcc46f783 Mon Sep 17 00:00:00 2001
From: Luis Fernandes <zipleen@gmail.com>
Date: Wed, 9 May 2018 10:44:43 +0100
Subject: [PATCH 2/2] Users will be able to change the deinterlace mode without
forcing it.
Subject: [PATCH 15/16] Users will be able to change the deinterlace mode
without forcing it.
---
include/vlc/libvlc_media_player.h | 5 ++++-
......@@ -52,7 +25,7 @@ index 20b220448b..cbb5ec251a 100644
LIBVLC_API void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
+ int deinterlace,
const char *psz_mode );
/**
diff --git a/lib/video.c b/lib/video.c
index a3e5b248e9..9bc0f634f5 100644
......@@ -60,7 +33,7 @@ index a3e5b248e9..9bc0f634f5 100644
+++ b/lib/video.c
@@ -663,14 +663,15 @@ end:
}
/******************************************************************************
- * libvlc_video_set_deinterlace : enable deinterlace
+ * libvlc_video_set_deinterlace : enable/disable/auto deinterlace and filter
......@@ -82,7 +55,7 @@ index a3e5b248e9..9bc0f634f5 100644
@@ -679,13 +680,10 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
&& strcmp (psz_mode, "auto"))
return;
- if (*psz_mode)
- {
+ if (psz_mode && deinterlace != 0)
......@@ -93,13 +66,13 @@ index a3e5b248e9..9bc0f634f5 100644
- var_SetInteger (p_mi, "deinterlace", 0);
+
+ var_SetInteger (p_mi, "deinterlace", deinterlace);
size_t n;
vout_thread_t **pp_vouts = GetVouts (p_mi, &n);
@@ -693,13 +691,10 @@ void libvlc_video_set_deinterlace( libvlc_media_player_t *p_mi,
{
vout_thread_t *p_vout = pp_vouts[i];
- if (*psz_mode)
- {
+ if (psz_mode && deinterlace != 0)
......@@ -113,6 +86,6 @@ index a3e5b248e9..9bc0f634f5 100644
vlc_object_release (p_vout);
}
free (pp_vouts);
--
2.15.1 (Apple Git-101)
--
2.17.0
From 49c6a2cba2a106aabd1bd535515d7088ac307353 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 27 Mar 2018 16:49:34 +0200
Subject: [PATCH 16/16] contrib: ffmpeg: enable videotoolbox encoder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
No problem for decoders since it won't be used.
(cherry picked from commit 1003d6aa220d18088d2d6d2949dc117b622f85e3)
Signed-off-by: Felix Paul Kühne <felix@feepk.net>
---
contrib/src/ffmpeg/rules.mak | 1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 4d2d716146..7a3b678370 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -50,7 +50,6 @@ FFMPEGCONF += \
--disable-linux-perf
ifdef HAVE_DARWIN_OS
FFMPEGCONF += \
- --disable-videotoolbox \
--disable-securetransport
endif
endif
--
2.17.0
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="d3c5d18" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="a4d6277" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......@@ -588,7 +588,6 @@ buildLibVLC() {
--disable-vcd \
--disable-vlc \
--disable-vlm \
--disable-httpd \
--disable-nls \
--disable-sse \
--disable-notify \
......
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