]> granicus.if.org Git - libx264/commitdiff
Make --profile main/baseline force off CQMfile
authorHii <hiiragikei@gmail.com>
Tue, 24 May 2011 00:31:17 +0000 (08:31 +0800)
committerFiona Glaser <fiona@x264.com>
Mon, 13 Jun 2011 02:48:50 +0000 (19:48 -0700)
common/common.c

index a30d0d8662b25b2412053a89fbdf07e9b75fc197..ff23cf4fe5c2ee9e3d648a6409547ee2c975eecb 100644 (file)
@@ -443,6 +443,7 @@ int x264_param_apply_profile( x264_param_t *param, const char *profile )
         param->analyse.b_transform_8x8 = 0;
         param->b_cabac = 0;
         param->i_cqm_preset = X264_CQM_FLAT;
+        param->psz_cqm_file = NULL;
         param->i_bframe = 0;
         param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
         if( param->b_interlaced )
@@ -460,6 +461,7 @@ int x264_param_apply_profile( x264_param_t *param, const char *profile )
     {
         param->analyse.b_transform_8x8 = 0;
         param->i_cqm_preset = X264_CQM_FLAT;
+        param->psz_cqm_file = NULL;
     }
     else if( !strcasecmp( profile, "high" ) || !strcasecmp( profile, "high10" ) )
     {