Removed saintdev's CLI patch to test.c to default the abitrate to 384 when no abitrate is provided on the commandline and the -6 (surround) option is passed in. The problem with this approach is that a bitrate of 384 is then used regardless of whether 5.1 extraction is actually used for the extraction (this isn't decided till work.c, which checks the channel config of the source audio tracks). Moreover, this causes a segmentation fault when using the OGM file format and extracting a 1.0 audio track from a DVD with the -6 option passed in, as vorbis_encode_setup_managed in encvorbis.c won't accept a bitrate of 384 for a 1-channel track.

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

1 files changed, 0 insertions, 7 deletions

diff --git a/test/test.c b/test/test.c
index 5506cbd11..818ceeae7 100644
--- a/test/test.c
+++ b/test/test.c
@@ -984,13 +984,6 @@ static int CheckOptions( int argc, char ** argv )
 		{

 			/* only attempt 5.1 export if exporting to AAC or Vorbis */

 			surround = 0;

-		} else {

-		    if (!abitrate && surround)

-		    {

-		        /* If we don't get a audio bitrate on the command line, and

-		           surround is being used, default to 384 */

-		        abitrate = 384;

-	        }

         }

 		

     }