Skip to content

V
vlc
Commit 966304b4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

avi: do not use vlc_object_kill()

parent c62a7ad8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/demux/avi/avi.c
View file @ 966304b4
...@@ -244,7 +244,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -244,7 +244,7 @@ static int Open( vlc_object_t * p_this )
demux_t *p_demux = (demux_t *)p_this; demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys; demux_sys_t *p_sys;
bool b_index = false; bool b_index = false, b_aborted = false;
int i_do_index; int i_do_index;
avi_chunk_list_t *p_riff; avi_chunk_list_t *p_riff;
...@@ -689,8 +689,7 @@ aviindex: ...@@ -689,8 +689,7 @@ aviindex:
msg_Dbg( p_demux, "Fixing AVI index" ); msg_Dbg( p_demux, "Fixing AVI index" );
goto aviindex; goto aviindex;
case 3: case 3:
/* Kill input */ b_aborted = true;
vlc_object_kill( p_demux->p_parent );
goto error; goto error;
} }
} }
...@@ -766,7 +765,7 @@ error: ...@@ -766,7 +765,7 @@ error:
AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root ); AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
free( p_sys ); free( p_sys );
return vlc_object_alive( p_demux ) ? VLC_EGENERIC : VLC_ETIMEOUT; return b_aborted ? VLC_ETIMEOUT : VLC_EGENERIC;
} }
/***************************************************************************** /*****************************************************************************
......
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