Skip to content

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

stream: remove useless vlc_object_kill() calls 

The stream is always killed at the same time as the access already.
parent 95b0fabc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
src/input/stream.c
View file @ a9d42c83
......@@ -1658,8 +1658,6 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read )
if( !p_sys->i_list )
{
i_read = p_access->pf_read( p_access, p_read, i_read );
if( p_access->b_die )
vlc_object_kill( s );
if( p_input )
{
uint64_t total;
......@@ -1675,8 +1673,6 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read )
i_read = p_sys->p_list_access->pf_read( p_sys->p_list_access, p_read,
i_read );
if( p_access->b_die )
vlc_object_kill( s );
/* If we reached an EOF then switch to the next stream in the list */
if( i_read == 0 && p_sys->i_list_index + 1 < p_sys->i_list )
......@@ -1724,8 +1720,6 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
if( !p_sys->i_list )
{
p_block = p_access->pf_block( p_access );
if( p_access->b_die )
vlc_object_kill( s );
if( pb_eof ) *pb_eof = p_access->info.b_eof;
if( p_input && p_block && libvlc_stats (p_access) )
{
......@@ -1743,8 +1737,6 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
}
p_block = p_sys->p_list_access->pf_block( p_sys->p_list_access );
if( p_access->b_die )
vlc_object_kill( s );
b_eof = p_sys->p_list_access->info.b_eof;
if( pb_eof ) *pb_eof = b_eof;
......
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