summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2007-07-24 16:19:21 +0000
committerjbrjake <[email protected]>2007-07-24 16:19:21 +0000
commit2bc2b7e747aa0dadbcf71d9b108f54f2da975cea (patch)
treecdb40abcfae11aaae9ae2b4245239034527bd0c4
parentf91755c43a608fec95c1c81413714f08cbec050d (diff)
Oops, --turbo would cause a bus error if x264 options were not specified. Thanks for the patch, ares01590!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@726 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--test/test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test.c b/test/test.c
index d3ae5a794..9c85e3121 100644
--- a/test/test.c
+++ b/test/test.c
@@ -591,7 +591,7 @@ static int HandleEvents( hb_handle_t * h )
*/
if( turbo_opts_enabled )
{
- int size = strlen(x264opts) + strlen(turbo_opts) + 2;
+ int size = (x264opts ? strlen(x264opts) : 0) + strlen(turbo_opts) + 2;
char *tmp_x264opts;
tmp_x264opts = malloc(size * sizeof(char));