Various fixes:

- Include parsecsv.c in the Jamfile so we can compile the CLI with Jam
- Quiet some compiler warnings in parsecsv.{c,h}
- Check some return values in muxmp4.c and encfaac.c and die gracefully if there is a problem.
- Correctly set the number of audio channels in the stsd atom.

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

1 files changed, 4 insertions, 0 deletions

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index d46e8aedd..95a047ac6 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -95,11 +95,15 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
     if( !faacEncSetConfiguration( pv->faac, cfg ) )
     {
         hb_log( "faacEncSetConfiguration failed" );
+        *job->die = 1;
+        return 0;
     }
 
     if( faacEncGetDecoderSpecificInfo( pv->faac, &bytes, &length ) < 0 )
     {
         hb_log( "faacEncGetDecoderSpecificInfo failed" );
+        *job->die = 1;
+        return 0;
     }
     memcpy( w->config->aac.bytes, bytes, length );
     w->config->aac.length = length;