[vlc-devel] commit: AVI: abort if user gave up while rebuilding the index (refs: #2872) ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 2 19:13:30 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug  2 20:12:28 2009 +0300| [4b169d8efd78f3a22715f72ba0ec4d6915335bf9] | committer: Rémi Denis-Courmont 

AVI: abort if user gave up while rebuilding the index (refs: #2872)

Previously, the core would fallback to other demux plugins which was
inefficient and error-prone.

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

 modules/demux/avi/avi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 2e32795..a473bf4 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -765,7 +765,7 @@ error:
     }
     AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
     free( p_sys );
-    return VLC_EGENERIC;
+    return vlc_object_alive( p_demux ) ? VLC_EGENERIC : VLC_ETIMEOUT;
 }
 
 /*****************************************************************************




More information about the vlc-devel mailing list