Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.1042
diff -u -r1.1042 mplayer.1
--- DOCS/man/en/mplayer.1	21 Jul 2005 17:27:20 -0000	1.1042
+++ DOCS/man/en/mplayer.1	21 Jul 2005 20:31:56 -0000
@@ -8339,6 +8339,16 @@
 Useful values are in the range <-2\-2> (default: 0).
 .
 .TP
+.B cqm=<option> (flat, jvt or file,<filename>)
+Uses either a predefined custom quantization matrix or loads a JM format
+matrix file.
+.br
+.I
+NOTE:
+Files encoded using CQMs are not currently decodable by FFMPEG based players.
+.RE
+.
+.TP
 .B level_idc=<10\-51>
 Set the bitstream's Level as defined by Annex A of the H.264 standard
 (default: 40 - Level 4.0).
Index: libmpcodecs/ve_x264.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
retrieving revision 1.34
diff -u -r1.34 ve_x264.c
--- libmpcodecs/ve_x264.c	19 Jul 2005 17:56:51 -0000	1.34
+++ libmpcodecs/ve_x264.c	21 Jul 2005 20:31:56 -0000
@@ -106,6 +106,7 @@
 static int log_level = 2;
 static int turbo = 0;
 static int visualize = 0;
+static char *cqm = NULL;
 
 m_option_t x264encopts_conf[] = {
     {"bitrate", &bitrate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL},
@@ -155,6 +156,7 @@
     {"qp_step", &qp_step, CONF_TYPE_INT, CONF_RANGE, 1, 50, NULL},
     {"pass", &pass, CONF_TYPE_INT, CONF_RANGE, 1, 3, NULL},
     {"rc_eq", &rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL},
+    {"cqm", &cqm, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"qcomp", &qcomp, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL},
     {"qblur", &qblur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
     {"cplx_blur", &complexity_blur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 999, NULL},
@@ -263,6 +265,24 @@
     mod->param.vui.i_sar_height = d_height*width;
     mod->param.i_threads = threads;
 
+    if(cqm != NULL){
+        if( strncasecmp( cqm, "flat", 4 ) == 0 )
+            mod->param.i_cqm_preset = X264_CQM_FLAT;
+        else if( strncasecmp( cqm, "jvt", 3 ) == 0 )
+            mod->param.i_cqm_preset = X264_CQM_JVT;
+        else if( strncasecmp( cqm, "file,", 5 ) == 0 )
+        {
+            mod->param.i_cqm_preset = X264_CQM_CUSTOM;
+            mod->param.psz_cqm_file = cqm + 5;
+            mp_msg( MSGT_MENCODER, MSGL_V, "x264: CQM file correctly loaded.\n" ); 
+        }
+        else
+        {
+            mp_msg( MSGT_MENCODER, MSGL_ERR, "x264: Please enter a valid CQM choice.\n" );
+            return 0;
+        }
+    }
+
     switch(pass) {
     case 0:
         mod->param.rc.b_stat_write = 0;