Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLCKit
Manage
Activity
Members
Labels
Plan
Issues
121
Issue boards
Milestones
Code
Merge requests
4
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLCKit
Merge requests
!12
3.0: buildscript: Bump libvlc hash
代码
评审变更
检出分支
下载
补丁
文本差异
Merged
3.0: buildscript: Bump libvlc hash
tguillem/VLCKit:3.0-buildscript-update
into
3.0
Overview
1
Commits
1
Pipelines
0
Changes
2
Merged
Thomas Guillem
requested to merge
tguillem/VLCKit:3.0-buildscript-update
into
3.0
5 years ago
Overview
1
Commits
1
Pipelines
0
Changes
2
Expand
1
0
Merge request reports
Compare
3.0
3.0 (base)
and
latest version
latest version
04eecae0
1 commit,
5 years ago
2 files
+
7
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
Resources/MobileVLCKit/patches/0018-ffmpeg-backport-vtenc-patches.patch
+
6
−
6
Options
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
@@ -24
2
,6 +24
2
,10 @@
ifdef USE_FFMPEG
$(APPLY) $(SRC)/ffmpeg/
armv7_fixup
.patch
$(APPLY) $(SRC)/ffmpeg/
dxva_vc1_crash
.patch
$(APPLY) $(SRC)/ffmpeg/
h264_early_SAR
.patch
@@ -24
6
,6 +24
6
,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
Loading