From a9d754a37787daccdd88e4d08ec95f9b9ae59a8c Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Mon, 30 Oct 2006 00:09:21 +0000 Subject: [PATCH] fix parsing of --deblock %d,%d (beta was ignored) git-svn-id: svn://svn.videolan.org/x264/trunk@597 df754926-b1dd-0310-bc7b-ec298dee348c --- common/common.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/common.c b/common/common.c index 6b16e0bc..4bc8fc09 100644 --- a/common/common.c +++ b/common/common.c @@ -313,13 +313,15 @@ int x264_param_parse( x264_param_t *p, const char *name, const char *value ) p->b_deblocking_filter = !atobool(value); OPT2("filter", "deblock") { - int count; - if( 0 < (count = sscanf( value, "%d:%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta )) || - 0 < (count = sscanf( value, "%d,%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta )) ) + if( 2 == sscanf( value, "%d:%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta ) || + 2 == sscanf( value, "%d,%d", &p->i_deblocking_filter_alphac0, &p->i_deblocking_filter_beta ) ) { p->b_deblocking_filter = 1; - if( count == 1 ) - p->i_deblocking_filter_beta = p->i_deblocking_filter_alphac0; + } + else if( sscanf( value, "%d", &p->i_deblocking_filter_alphac0 ) ) + { + p->b_deblocking_filter = 1; + p->i_deblocking_filter_beta = p->i_deblocking_filter_alphac0; } else p->b_deblocking_filter = atobool(value); -- 2.40.0