[vlc-commits] input: input_SlaveSourceAdd: use intermediate variable
Thomas Guillem
git at videolan.org
Mon Jul 23 12:56:27 CEST 2018
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jul 23 12:05:54 2018 +0200| [e90a156a8403ddff4ae2e350c3f92423390df597] | committer: Thomas Guillem
input: input_SlaveSourceAdd: use intermediate variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e90a156a8403ddff4ae2e350c3f92423390df597
---
src/input/input.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index e84b024c24..6cd8ffb6c0 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -3221,6 +3221,7 @@ static int input_SlaveSourceAdd( input_thread_t *p_input,
enum slave_type i_type, const char *psz_uri,
unsigned i_flags )
{
+ input_thread_private_t *priv = input_priv(p_input);
size_t count;
const char *psz_es;
const char *psz_forced_demux;
@@ -3268,8 +3269,7 @@ static int input_SlaveSourceAdd( input_thread_t *p_input,
int64_t i_time;
/* Set position */
- if( demux_Control( input_priv(p_input)->master->p_demux,
- DEMUX_GET_TIME, &i_time ) )
+ if( demux_Control( priv->master->p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
InputSourceDestroy( p_source );
@@ -3289,7 +3289,7 @@ static int input_SlaveSourceAdd( input_thread_t *p_input,
InputUpdateMeta( p_input, p_source->p_demux );
}
- TAB_APPEND( input_priv(p_input)->i_slave, input_priv(p_input)->slave, p_source );
+ TAB_APPEND( priv->i_slave, priv->slave, p_source );
if( !b_forced )
return VLC_SUCCESS;
@@ -3310,8 +3310,10 @@ static int input_SlaveSourceAdd( input_thread_t *p_input,
{
const int i_id = list[count].i_int;
- es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
- es_out_Control( input_priv(p_input)->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id, false );
+ es_out_Control( priv->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID,
+ i_id );
+ es_out_Control( priv->p_es_out_display, ES_OUT_SET_ES_BY_ID,
+ i_id, false );
}
free(list);
More information about the vlc-commits
mailing list