trellis=2 slightly affected intra analysis even without subme=6

git-svn-id: svn://svn.videolan.org/x264/trunk@440 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/encoder/analyse.c b/encoder/analyse.c
index f305279e4e15444f1cc9c3730072d9e42db3b86e..77189219a7da35a32660eb083cca06be054cde6b 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -195,7 +195,7 @@ static void x264_mb_analyse_init( x264_t *h, x264_mb_analysis_t *a, int i_qp )
     h->mb.i_subpel_refine = h->param.analyse.i_subpel_refine;
     h->mb.b_chroma_me = h->param.analyse.b_chroma_me && h->sh.i_type == SLICE_TYPE_P
                         && h->mb.i_subpel_refine >= 5;
-    h->mb.b_trellis = h->param.analyse.i_trellis > 1;
+    h->mb.b_trellis = h->param.analyse.i_trellis > 1 && a->b_mbrd;
     h->mb.b_transform_8x8 = 0;
     h->mb.b_noise_reduction = 0;