[vlc-devel] [PATCH 1/4] es_out: fix regression overriding es selection variables
Francois Cartegnie
fcvlcdev at free.fr
Tue Jul 7 13:43:21 CEST 2020
and removes unused flag from cfea200c8c7596de07d9e4b7bb88f993015939be
---
src/input/es_out.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/input/es_out.c b/src/input/es_out.c
index ab8beb25ac..c78205a278 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -112,7 +112,6 @@ struct es_out_id_t
/* */
bool b_scrambled;
- bool b_forced; /* if true, bypass variables when selecting this track */
/* Channel in the track type */
int i_channel;
@@ -2048,7 +2047,6 @@ static es_out_id_t *EsOutAddLocked( es_out_t *out, input_source_t *source,
es_format_Init( &es->fmt_out, UNKNOWN_ES, 0 );
es->b_scrambled = false;
- es->b_forced = false;
es->b_terminated = false;
switch( es->fmt.i_cat )
@@ -2270,7 +2268,7 @@ static void EsOutSelectEs( es_out_t *out, es_out_id_t *es, bool b_force )
const bool b_sout = input_priv(p_input)->p_sout != NULL;
/* If b_forced, the ES is specifically requested by the user, so bypass
* the following vars check. */
- if( !es->b_forced )
+ if( !b_force )
{
if( es->fmt.i_cat == VIDEO_ES || es->fmt.i_cat == SPU_ES )
{
--
2.25.4
More information about the vlc-devel
mailing list