Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vlc.js
Manage
Activity
Members
Labels
Plan
Issues
43
Issue boards
Milestones
Code
Merge requests
8
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Jean-Baptiste Kempf
vlc.js
Merge requests
!4
Update compilation script and update tested hash
代码
评审变更
检出分支
下载
补丁
文本差异
Closed
Update compilation script and update tested hash
b1ue/vlc.js:update-build6
into
master
Overview
1
Commits
4
Pipelines
0
Changes
2
Closed
Mehdi Sabwat
requested to merge
b1ue/vlc.js:update-build6
into
master
4 years ago
Overview
1
Commits
4
Pipelines
0
Changes
2
Expand
Add TESTED_HASH, to manage vlc master updates
Patch that will apply to core (will revert when it will be upstream)
Edited
4 years ago
by
Jean-Baptiste Kempf
0
0
Merge request reports
Compare
master
version 1
563c7d21
4 years ago
master (base)
and
latest version
latest version
d6bb2ea2
4 commits,
4 years ago
version 1
563c7d21
2 commits,
4 years ago
2 files
+
45
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch
0 → 100644
+
37
−
0
Options
From patchwork Mon Mar 9 23:12:16 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: es_out: use sout control only when sout is enabled
From: Alexandre Janniaux <ajanni@videolabs.io>
X-Patchwork-Id: 26662
Message-Id: <20200309231216.132003-1-ajanni@videolabs.io>
To: vlc-devel@videolan.org
Date: Tue, 10 Mar 2020 00:12:16 +0100
sout_instance_ControlsPace implementation is only compiled when
ENABLE_SOUT is defined, so es_out should only use it in that case.
---
src/input/es_out.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 118c780c95..e4e0e460ac 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2752,6 +2752,7 @@
static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
return VLC_SUCCESS;
}
+#ifdef ENABLE_SOUT
/* Check for sout mode */
if( input_priv(p_input)->p_sout )
{
@@ -2762,6 +2763,7 @@
static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
input_priv(p_input)->b_out_pace_control = pace;
}
+#endif
/* Decode */
if( es->p_dec_record )
Loading