summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-04-28 21:13:47 +0000
committerRodeo <[email protected]>2013-04-28 21:13:47 +0000
commitab0a39397c7b3630ba141cc8175d5eb05ef79a7d (patch)
tree8ae683bc9939f2fb47592da5808feffcd02c0309 /libhb
parent0b0ecc8e17212f2081f0b942c54dc7abdbb22dba (diff)
sync: fix a hang when the avcodec encoder for silence insertion fails to open.
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
Diffstat (limited to 'libhb')
-rw-r--r--libhb/sync.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libhb/sync.c b/libhb/sync.c
index fe3d01915..3e2bbb703 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -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;
}