[vlc-commits] stream: remove useless vlc_object_kill() calls

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 10 19:19:04 2012 +0200| [a9d42c83750ab4665b0542136eb6b8fac5ee5507] | committer: Rémi Denis-Courmont

stream: remove useless vlc_object_kill() calls

The stream is always killed at the same time as the access already.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9d42c83750ab4665b0542136eb6b8fac5ee5507
---

 src/input/stream.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/input/stream.c b/src/input/stream.c
index 189f281..fa01b3e 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -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;