[vlc-commits] stream_extractor: archive: enable Control/Seek even if libarchive died

Filip Roséen git at videolan.org
Sun Jul 29 16:29:56 CEST 2018


vlc/vlc-3.0 | branch: master | Filip Roséen <filip at atch.se> | Wed Jul 25 21:49:14 2018 +0200| [bd355244bb69ddb9642a03a4520cab2ecfdf69f7] | committer: Jean-Baptiste Kempf

stream_extractor: archive: enable Control/Seek even if libarchive died

As we might be able to recover from a libarchive fatal error (by
resetting the handle to an appropriate state), there is no need for us
to disable controls completely.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 51824f14fdcbfb813cba667e432cb0df2b639776)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/stream_extractor/archive.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index 505b444863..af69a29094 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -493,9 +493,6 @@ static int Control( stream_extractor_t* p_extractor, int i_query, va_list args )
 {
     private_sys_t* p_sys = p_extractor->p_sys;
 
-    if( p_sys->b_dead )
-        return VLC_EGENERIC;
-
     switch( i_query )
     {
         case STREAM_CAN_FASTSEEK:
@@ -628,9 +625,6 @@ static int Seek( stream_extractor_t* p_extractor, uint64_t i_req )
 {
     private_sys_t* p_sys = p_extractor->p_sys;
 
-    if( p_sys->b_dead )
-        return VLC_EGENERIC;
-
     if( !p_sys->p_entry || !p_sys->b_seekable_source )
         return VLC_EGENERIC;
 



More information about the vlc-commits mailing list