Navigation

Changeset 3f035aadc331e5b30fa2db29c24462e50e624404

Timestamp:

06/07/07 18:39:38 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1181234378 +0000

git-parent:

[47e6dfa48ec84ff167d27d4cf304ef0cb9152e03]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1181234378 +0000

Message:

Fix deadlock

Files:

r0e39834	r3f035aa
59	59	{
60	60	msg_Err( p_aout, "too many inputs already (%d)", p_aout->i_nb_inputs );
61		~~return NULL~~;
	61	goto error;
62	62	}
63	63
…	…
66	66	{
67	67	msg_Err( p_aout, "out of memory" );
68		~~return NULL~~;
	68	goto error;
69	69	}
70	70
…	…
117	117	{
118	118	aout_OutputDelete( p_aout );
119		vlc_mutex_unlock( &p_aout->mixer_lock );
120		return NULL;
	119	goto error;
121	120	}
122	121
…	…
124	123
125	124	vlc_mutex_unlock( &p_aout->mixer_lock );
126
127	125	var_Create( p_this, "audio-desync", VLC_VAR_INTEGER \| VLC_VAR_DOINHERIT );
128	126	var_Get( p_this, "audio-desync", &val );
…	…
146	144
147	145	return p_input;
	146
	147	error:
	148	vlc_mutex_unlock( &p_aout->mixer_lock );
	149	return NULL;
148	150	}
149	151