Commit 10b3d6f1 authored by littlejohn's avatar littlejohn

fix for libvlc_get_input_thread: check for null before locking. fixes #1522

parent c6fabd0f
......@@ -92,10 +92,7 @@ public class MediaListPlayerTest
Assert.assertEquals(0, exception.raised);
}
// @Test
/**
* see Ticket #1522 on trac ( http://trac.videolan.org/vlc/ticket/1522 )
*/
@Test
public void mediaListPlayerIsPlayingTest()
{
libvlc_exception_t exception = new libvlc_exception_t();
......
......@@ -124,6 +124,11 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi,
{
input_thread_t *p_input_thread;
if ( !p_mi )
{
RAISENULL( "Input is NULL" );
}
vlc_mutex_lock( &p_mi->object_lock );
if( !p_mi || p_mi->i_input_id == -1 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment