* Fix an accidental change from [18009] and add a mutex destroy I forgot to commit

diff --git a/THANKS b/THANKS
index ae555a93c71015efcb7029c51c9d6bdcfba643ba..e2febe6a86f6145bf1818eb4fc1dab2bcec608de 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -27,6 +27,7 @@ Basil Achermann <vlc at acherma dot com> - Patch to handle esc and space key eve
 Barak Ori <barakori at gmail dot com> - Bidi fixes
 Benjamin Mironer <bmironer at noos.fr> - Mac OS X fixes
 Benoit Steiner <benny at via.ecp.fr> - MPEG system input, network input
+Bill <wenwuangel at hotmail .com> - memleak fixes
 Bill Eldridge <bill at rfa.org> - documentation
 Bob Maguire <maguirer at rjmaguire dot com> - addition of some controls to the OSX interface
 Brian Robb <vascy at hotmail dot com> - win32 CD/DVD drive detection in wx, bug fixes
@@ -55,7 +56,7 @@ Davor Orel <syntheticamac at yahoo.it> - Mac OS X icons
 Dennis van Amerongen <Dennis dot vanAmerongen at nob dot nl> - x264 options unification
 Dennis Lou <dlou99 at yahoo dot com> - ATSC support in the DVB module
 Dermot McGahon <dermot at dspsrv dot com> - Bug fixes, RC interface loop and repeat
-Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols
+Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols, configure fixes
 DirektX <direktx at freemail.hu> - Hungarian translation
 Dugal Harris - DirectShow fixes and MJPEG patches
 Emmanuel Blindauer <manu at agat.net> - aRts audio output

diff --git a/src/input/input.c b/src/input/input.c
index c1b7fda86fc672a9c026abe1766c203a3bfad274..810d1bccd177424fd54c22abb58488c16bda42b2 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -859,7 +859,7 @@ static int Init( input_thread_t * p_input )
 
         if( p_input->i_start > 0 )
         {
-            if( p_input->i_start >= p_input->input.p_item->i_duration )
+            if( p_input->i_start >= val.i_time )
             {
                 msg_Warn( p_input, "invalid start-time ignored" );
             }

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index cca6fdaaffd7983a437d5470a62b0f3bf01941a9..3b9d8495afd596558ad1f6988397f2e76128c7dd 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -205,6 +205,7 @@ void playlist_Destroy( playlist_t *p_playlist )
 
     PL_UNLOCK;
 
+    vlc_mutex_destroy( &p_playlist->p_stats->lock );
     if( p_playlist->p_stats )
         free( p_playlist->p_stats );