[vlc-devel] commit: Do not ask the user if we should build the avi index when the demuxer has been killed . (Laurent Aimar )

git version control git at videolan.org
Fri Jun 19 01:24:09 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Fri Jun 19 00:51:05 2009 +0200| [ae0845782318509eb3dac8ee27f054b60e6ce462] | committer: Derk-Jan Hartman 

Do not ask the user if we should build the avi index when the demuxer has been killed.
(cherry picked from commit 8d74508733922ae17b17484e8e92e84b040bf592)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

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

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 1a0cc8b..4fe88b4 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -676,6 +676,9 @@ aviindex:
                           (mtime_t)p_avih->i_microsecperframe /
                           (mtime_t)1000000 )
     {
+        if( !vlc_object_alive( p_demux) )
+            goto error;
+
         msg_Warn( p_demux, "broken or missing index, 'seek' will be "
                            "approximative or will exhibit strange behavior" );
         if( i_do_index == 0 && !b_index )




More information about the vlc-devel mailing list