X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fscan.c;h=6ff83a872275e89fcea56007409aa8926ad90668;hb=5c5aaf3564f95386860c5a7fd66993cd85d06751;hp=2088883abe24e5eafa6c9ea28c179c1be7d1b2e4;hpb=2e44e47cdda8bcc90d8232d9b2829caa13b7a7cc;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/scan.c b/libhb/scan.c index 2088883a..6ff83a87 100644 --- 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;