fix subtitle indepth scan abort & hang.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1645 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/reader.c b/libhb/reader.c
index b06816d3d0b9ea7133f79fbbd2802ce3c3dcc0de..0516932fb60b20884936c4d6830be79d1ed6b174 100644 (file)
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -334,7 +334,8 @@ static void ReaderFunc( void * _r )
          ( audio = hb_list_item( r->job->title->list_audio, n ) ) != NULL;
          ++n )
     {
-        push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) );
+        if ( audio->priv.fifo_in )
+            push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) );
     }
 
     hb_list_empty( &list );

diff --git a/libhb/sync.c b/libhb/sync.c
index 09ef0d9a27317cf4cca8dd2a4a210777481965ba..524ca4d1b1f2a69d9533b6414f223b72efe4ca92 100644 (file)
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -111,10 +111,13 @@ int syncInit( hb_work_object_t * w, hb_job_t * job )
     pv->busy |= 1;
 
     /* Initialize libsamplerate for every audio track we have */
-    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+    if ( ! job->indepth_scan )
     {
-        pv->busy |= ( 1 << (i + 1) );
-        InitAudio( w, i );
+        for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+        {
+            pv->busy |= ( 1 << (i + 1) );
+            InitAudio( w, i );
+        }
     }
 
     /* Get subtitle info, if any */