]> granicus.if.org Git - handbrake/commitdiff
sync: fix a hang when the avcodec encoder for silence insertion fails to open.
authorRodeo <tdskywalker@gmail.com>
Sun, 28 Apr 2013 21:13:47 +0000 (21:13 +0000)
committerRodeo <tdskywalker@gmail.com>
Sun, 28 Apr 2013 21:13:47 +0000 (21:13 +0000)
This affects e.g. AAC Passthru with more than 6 channels.

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

libhb/sync.c

index fe3d019159bd5650a33a7ed3b91337c00b1c085b..3e2bbb70377ad4c83816917e56746f0ff882f7aa 100644 (file)
@@ -979,9 +979,10 @@ static void InitAudio( hb_job_t * job, hb_sync_common_t * common, int i )
             c->channel_layout = w->audio->config.in.channel_layout;
         }
 
-        if( hb_avcodec_open( c, codec, NULL, 0 ) < 0 )
+        if (hb_avcodec_open(c, codec, NULL, 0) < 0)
         {
-            hb_log( "sync: avcodec_open failed" );
+            hb_error("sync: avcodec_open failed");
+            *job->die = 1;
             return;
         }