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

MVK: Remove unneeded patches

parent 712586be
From f4c8c5e24b4fa50ea231afb46bc7bb030b71c7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 4 May 2016 16:00:40 +0200
Subject: [PATCH 06/16] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/media_player.c b/lib/media_player.c
index b5677ae7ec..ebe711e310 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -641,6 +641,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
#endif
#ifdef __APPLE__
var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);
+ var_Create (mp, "videotoolbox-zero-copy", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
#endif
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.11.0
From f59fad2b8635a7f4fe1eaf658155286281bcff55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:05:51 +0200
Subject: [PATCH 14/16] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3e5f910e99..6acb5da740 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,7 +2,7 @@
#Uncomment the one you want
#USE_LIBAV ?= 1
-#USE_FFMPEG ?= 1
+USE_FFMPEG ?= 1
ifdef USE_FFMPEG
FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
--
2.11.0
......@@ -403,6 +403,7 @@ buildLibVLC() {
export ac_cv_func_mkostemp=no
export ac_cv_func_mkostemps=no
export USE_FFMPEG=1
../bootstrap ${BUILD} --host=${TARGET} --prefix=${VLCROOT}/contrib/${OSSTYLE}-${TARGET}-${ARCH} --disable-gpl \
--disable-disc --disable-sout \
--disable-sdl \
......
......@@ -194,6 +194,7 @@ buildLibVLC() {
spushd contrib
mkdir -p vlckitbuild
spushd vlckitbuild
export USE_FFMPEG=1
../bootstrap --build=${TARGET} --disable-bluray --disable-growl --disable-sparkle --disable-SDL --disable-SDL_image --disable-microdns --disable-fontconfig --disable-bghudappkit --disable-protobuf
make -j$MAKE_JOBS fetch ${args}
......
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