omit redundant mc after non-rdo dct size decision, and in b-direct rdo

[x264] / common / set.h

diff --git a/common/set.h b/common/set.h
index c17e95f843f06717433d6ee10a08b40b31aba744..e6173b0bd9969da3e4a90b44035421031f2fe401 100644 (file)
--- a/common/set.h
+++ b/common/set.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _SET_H
-#define _SET_H 1
+#ifndef X264_SET_H
+#define X264_SET_H
 
 enum profile_e
 {
@@ -211,8 +211,15 @@ static const uint8_t x264_cqm_flat16[64] =
     16,16,16,16,16,16,16,16,
     16,16,16,16,16,16,16,16
 };
+static const uint8_t * const x264_cqm_jvt[6] =
+{
+    x264_cqm_jvt4i, x264_cqm_jvt4p,
+    x264_cqm_jvt4i, x264_cqm_jvt4p,
+    x264_cqm_jvt8i, x264_cqm_jvt8p
+};
 
-void x264_cqm_init( x264_t *h );
+int  x264_cqm_init( x264_t *h );
+void x264_cqm_delete( x264_t *h );
 int  x264_cqm_parse_file( x264_t *h, const char *filename );
 
 #endif