vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Jan 18 21:42:04 2019 +0200| [c0297ecdf8fd94f21a6aa9c7afe307694010e2ca] | committer: Rémi Denis-Courmont
resource: remove constant recycle parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0297ecdf8fd94f21a6aa9c7afe307694010e2ca --- src/input/decoder.c | 4 ++-- src/input/resource.c | 8 +++----- src/input/resource.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/input/decoder.c b/src/input/decoder.c index ae8f700302..312799289c 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -572,7 +572,7 @@ static int vout_update_format( decoder_t *p_dec ) .vout = p_vout, .fmt = &fmt, .dpb_size = dpb_size + p_dec->i_extra_picture_buffers + 1, .mouse_event = MouseEvent, .opaque = p_dec - }, true ); + } ); vlc_mutex_lock( &p_owner->lock ); p_owner->p_vout = p_vout; @@ -2016,7 +2016,7 @@ static void DeleteDecoder( decoder_t * p_dec ) vout_Cancel( p_owner->p_vout, false ); input_resource_RequestVout( p_owner->p_resource, - &(vout_configuration_t) { .vout = p_owner->p_vout }, true ); + &(vout_configuration_t) { .vout = p_owner->p_vout } ); } break; case SPU_ES: diff --git a/src/input/resource.c b/src/input/resource.c index 8f4b39d30e..16d58c90f1 100644 --- a/src/input/resource.c +++ b/src/input/resource.c @@ -370,8 +370,7 @@ void input_resource_SetInput( input_resource_t *p_resource, input_thread_t *p_in } vout_thread_t *input_resource_RequestVout( input_resource_t *p_resource, - const vout_configuration_t *cfg, - bool b_recycle ) + const vout_configuration_t *cfg ) { vout_thread_t *vout; @@ -433,9 +432,8 @@ vout_thread_t *input_resource_RequestVout( input_resource_t *p_resource, .vout = cfg->vout, }); - if (p_resource->p_vout_free != NULL || active_vouts > 0 || !b_recycle) { - if (b_recycle) - msg_Dbg(p_resource->p_parent, "destroying vout (already one saved or active)"); + if (p_resource->p_vout_free != NULL || active_vouts > 0) { + msg_Dbg(p_resource->p_parent, "destroying vout (already one saved or active)"); vout_CloseAndRelease(cfg->vout); } else { msg_Dbg(p_resource->p_parent, "saving a free vout"); diff --git a/src/input/resource.h b/src/input/resource.h index 3127a9adb9..e695694950 100644 --- a/src/input/resource.h +++ b/src/input/resource.h @@ -41,7 +41,7 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *, sout_instance_t * This function handles vout request. */ vout_thread_t *input_resource_RequestVout( input_resource_t *, - const vout_configuration_t *, bool ); + const vout_configuration_t * ); /** * This function returns one of the current vout if any. _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
