# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_vout.h>
#include <vlc_osd.h>
return p_vout;
}
-static void HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout, int *pi_vout )
+
+static void HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout,
+ size_t *pi_vout )
{
vout_thread_t **pp_vout;
if( p_resource->i_vout <= 0 )
goto exit;
- pp_vout = calloc( p_resource->i_vout, sizeof(*pp_vout) );
+ pp_vout = malloc( p_resource->i_vout * sizeof(*pp_vout) );
if( !pp_vout )
goto exit;
{
return HoldVout( p_resource );
}
-void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout, int *pi_vout )
+
+void input_resource_HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout,
+ size_t *pi_vout )
{
HoldVouts( p_resource, ppp_vout, pi_vout );
}
+
void input_resource_TerminateVout( input_resource_t *p_resource )
{
input_resource_RequestVout( p_resource, NULL, NULL, false );
}
aout_instance_t *input_resource_HoldAout( input_resource_t *p_resource )
{
- vlc_mutex_lock( &p_resource->lock );
- aout_instance_t *p_ret = HoldAout( p_resource );
- vlc_mutex_unlock( &p_resource->lock );
-
- return p_ret;
+ return HoldAout( p_resource );
}
/* */
sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_instance_t *p_sout, const char *psz_sout )