[x264-devel] Make --profile main/baseline force off CQMfile

[Hii]

x264 | branch: master | Hii <hiiragikei at gmail.com> | Tue May 24 08:31:17 2011 +0800| [cb97de722d214f2fe8a0a3dda583d5107cc0fb51] | committer: Jason Garrett-Glaser

Make --profile main/baseline force off CQMfile

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=cb97de722d214f2fe8a0a3dda583d5107cc0fb51
---

 common/common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/common/common.c b/common/common.c
index a30d0d8..ff23cf4 100644
--- a/common/common.c
+++ b/common/common.c
@@ -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" ) )
     {