diff options
author | dynaflash <[email protected]> | 2007-09-27 16:15:55 +0000 |
---|---|---|
committer | dynaflash <[email protected]> | 2007-09-27 16:15:55 +0000 |
commit | e3c9a83c0fcc412d7ce0d41edd0d019e0badadfb (patch) | |
tree | d4f65183a2d335d254bf4ae53ae184397cf86db8 /libhb | |
parent | 19731d61fb8bb93db85d3e22b947104ed99d8915 (diff) |
Fixes encx264.c from rev 994 to avoid crasing with 2pass and auto select / forced subtitiles.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@995 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r-- | libhb/encx264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/encx264.c b/libhb/encx264.c index a061cf1f3..0de2e9f3b 100644 --- a/libhb/encx264.c +++ b/libhb/encx264.c @@ -97,9 +97,9 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) Merritt implemented in the Mplayer/Mencoder project. */ - char *x264opts = strdup(job->x264opts); - if( x264opts != NULL && *x264opts != '\0' ) + if( job->x264opts != NULL && *job->x264opts != '\0' ) { + char *x264opts = strdup(job->x264opts); while( *x264opts ) { char *name = x264opts; @@ -161,8 +161,8 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job ) if( ret == X264_PARAM_BAD_VALUE ) hb_log( "x264 options: Bad argument %s=%s", name, value ? value : "(null)" ); } + free(x264opts); } - free(x264opts); if( job->pixel_ratio ) |