CLI: missed another conditional that forces burned subs in mp4

also, print "Foreign Audio Search" instead of "Render/Burn in" in the log
during an indepth_scan.

git-svn-id: svn://localhost/HandBrake/trunk@3373 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/work.c b/libhb/work.c
index c1891a6..c219dd8 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -322,6 +322,7 @@ void hb_display_job_info( hb_job_t * job )
                         subtitle->source == UTF8SUB ? "UTF-8" : 
                         subtitle->source == TX3GSUB ? "TX3G" : 
                         subtitle->source == SSASUB ? "SSA" : "Unknown",
+                        job->indepth_scan ? "Foreign Audio Search" :
                         subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through",
                         subtitle->config.force ? ", Forced Only" : "",
                         subtitle->config.default_track ? ", Default" : "" );

diff --git a/test/test.c b/test/test.c
index 27ff0b9..fbfbb08 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -1757,11 +1757,11 @@ static int HandleEvents( hb_handle_t * h )
                         }
                         force = test_sub_list( subforce, "scan", pos );
 
-                        if ( !burn && mux == HB_MUX_MKV )
+                        if ( !burn )
                         {
                             job->select_subtitle_config.dest = PASSTHRUSUB;
                         }
-                        else if ( burn )
+                        else
                         {
                             if ( sub_burned )
                             {