Skip to content
Snippets Groups Projects

Update compilation script and update tested hash

Closed Mehdi Sabwat requested to merge b1ue/vlc.js:update-build6 into master
2 files
+ 45
1
Compare changes
  • Side-by-side
  • Inline
Files
2
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