diff options
| author | Rodeo <[email protected]> | 2012-05-14 16:27:23 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-05-14 16:27:23 +0000 |
| commit | c595d44bb21b9148a3a9e5ababc57bba5d05e5d7 (patch) | |
| tree | 50ba096e0fcac8b645c46f84d1be3442b55b44c3 /libhb | |
| parent | d0adb5b72b26ae5dfa2d553e0162c3b53c6a905a (diff) | |
Fix a couple Foreign Audio Search issues causes by the changes introduced in revision 4622:
- hang if forced-only were not set
- Foreign Audio Search would select a subtitle track containing forced subtitles even if forced-only were not set
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4678 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/work.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libhb/work.c b/libhb/work.c index ae836288e..5f27156ee 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -1005,12 +1005,6 @@ static void do_job( hb_job_t * job ) subtitle->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE ); subtitle->fifo_out = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE ); - if( job->indepth_scan && - !( job->select_subtitle_config.force && - hb_subtitle_can_force( subtitle->source ) ) ) - { - continue; - } w = hb_get_work( subtitle->codec ); w->fifo_in = subtitle->fifo_in; w->fifo_out = subtitle->fifo_raw; @@ -1386,10 +1380,10 @@ cleanup: } } - if( subtitle_forced_id ) + if( subtitle_forced_id && job->select_subtitle_config.force ) { - /* If there is a subtitle stream with forced subtitles - * then select it in preference to the lowest. */ + /* If there is a subtitle stream with forced subtitles and forced-only + * is set, then select it in preference to the lowest. */ subtitle_hit = subtitle_forced_id; hb_log( "Found a subtitle candidate with id 0x%x (contains forced subs)", subtitle_hit ); |