Soft Subs Part 2: Auto-detect CC during scan, add CC to subtitle list in title, if...

[handbrake-jp/handbrake-jp-git.git] / libhb / scan.c

diff --git a/libhb/scan.c b/libhb/scan.c
index 2088883..6ff83a8 100644 (file)
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -224,8 +224,7 @@ static void ScanFunc( void * _data )
         job->vrate_base = title->rate_base;
 
         job->list_audio = hb_list_init();
-
-        job->subtitle = -1;
+        job->list_subtitle = hb_list_init();
 
         job->mux = HB_MUX_MP4;
     }
@@ -406,7 +405,11 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
     hb_log( "scan: decoding previews for title %d", title->index );
 
     if (data->dvd)
-      hb_dvd_start( data->dvd, title->index, 1 );
+    {
+      hb_dvd_start( data->dvd, title, 1 );
+      title->angle_count = hb_dvd_angle_count( data->dvd );
+      hb_log( "scan: title angle(s) %d", title->angle_count );
+    }
 
     for( i = 0; i < data->preview_count; i++ )
     {
@@ -437,6 +440,7 @@ static int DecodePreviews( hb_scan_t * data, hb_title_t * title )
         int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2;
         hb_work_object_t *vid_decoder = hb_get_work( vcodec );
         vid_decoder->codec_param = title->video_codec_param;
+        vid_decoder->title = title;
         vid_decoder->init( vid_decoder, NULL );
         hb_buffer_t * vid_buf = NULL;
         int vidskip = 0;