The per-stream timing changes (r1570) make the overall timing depend on which media streams we process. So we can't ignore audio during pass 1 or the video timing will change between passes & make x264 abort. (Thanks to jbrjake for pointing out the problem.)

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

1 files changed, 3 insertions, 7 deletions

diff --git a/libhb/hb.c b/libhb/hb.c
index f73a2437e..cde51322c 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -867,15 +867,11 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
     /* Copy the audio track(s) we want */
     title_copy->list_audio = hb_list_init();
 
-    /* Do nothing about audio during first pass */
-    if( job->pass == 0 || job->pass == 2 )
+    for( i = 0; i < hb_list_count(job->list_audio); i++ )
     {
-        for( i = 0; i < hb_list_count(job->list_audio); i++ )
+        if( ( audio = hb_list_item( job->list_audio, i ) ) )
         {
-            if( ( audio = hb_list_item( job->list_audio, i ) ) )
-            {
-                hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
-            }
+            hb_list_add( title_copy->list_audio, hb_audio_copy(audio) );
         }
     }