[vlc-commits] stream: remove no longer used stream_t.b_error

Rémi Denis-Courmont git at videolan.org
Tue Sep 1 20:35:35 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Sep  1 18:16:11 2015 +0300| [fa4f2b18d20b5647369367e59cb885e92d72d342] | committer: Rémi Denis-Courmont

stream: remove no longer used stream_t.b_error

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

 include/vlc_stream.h     |    1 -
 src/input/stream.c       |    1 -
 src/input/stream_demux.c |    2 --
 3 files changed, 4 deletions(-)

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index e2a704b..44d3297 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -46,7 +46,6 @@ extern "C" {
 struct stream_t
 {
     VLC_COMMON_MEMBERS
-    bool        b_error;
 
     /* Module properties for stream filter */
     module_t    *p_module;
diff --git a/src/input/stream.c b/src/input/stream.c
index eab1819..a260fbe 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -66,7 +66,6 @@ stream_t *stream_CommonNew(vlc_object_t *parent)
 
     stream_t *s = &priv->stream;
 
-    s->b_error = false;
     s->p_module = NULL;
     s->psz_url = NULL;
     s->p_source = NULL;
diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index a67c031..f738dce 100644
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -174,8 +174,6 @@ static ssize_t DStreamRead( stream_t *s, void *buf, size_t len )
 
     if( !atomic_load( &sys->active ) )
         return -1;
-    if( s->b_error )
-        return -1;
     if( len == 0 )
         return 0;
 



More information about the vlc-commits mailing list