Commit 04eecae0 authored by Thomas Guillem's avatar Thomas Guillem

buildscript: Bump libvlc hash

parent b3d29a99
From 0751562da380cd3632569793b6d23bc270d45f4c Mon Sep 17 00:00:00 2001
From c91696810190457fe6d4f1b68c6d05ebcfcbc225 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 18 Jun 2018 12:31:13 +0200
Subject: [PATCH 18/26] ffmpeg: backport vtenc patches
......@@ -340,13 +340,13 @@ index 0000000000..42f4cce1e6
+2.18.0
+
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 2837616642..59d8b1e8a5 100644
index 6fefe4d5f7..74dea0aeca 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -242,6 +242,10 @@ ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
$(APPLY) $(SRC)/ffmpeg/h264_early_SAR.patch
@@ -246,6 +246,10 @@ ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/ffmpeg-mkv-overshoot.patch
$(APPLY) $(SRC)/ffmpeg/0001-avcodec-hevcdec-set-the-SEI-parameters-early-on-the-.patch
$(APPLY) $(SRC)/ffmpeg/0001-avcodec-h264_slice-set-the-SEI-parameters-early-on-t.patch
+ $(APPLY) $(SRC)/ffmpeg/0001-avcodec-videotoolboxenc-fix-mutex-cond-leak-in-error.patch
+ $(APPLY) $(SRC)/ffmpeg/0002-avcodec-videotoolboxenc-split-initialization.patch
+ $(APPLY) $(SRC)/ffmpeg/0003-avcodec-videotoolboxenc-fix-invalid-session-on-iOS.patch
......
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="774a96ae6" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="dedb3bda998ca2d56960f6f4d3bccd5e643e28e3" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......
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