[x264-devel] commit: Don't do deblock-aware RD if deblocking is off ( Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Thu Aug 26 09:12:01 2010 -0400| [5b8f40714b10df5a5bf24ebb6be530a8458e2fdf] | committer: Jason Garrett-Glaser 

Don't do deblock-aware RD if deblocking is off

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

 encoder/analyse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/encoder/analyse.c b/encoder/analyse.c
index fdc2498..3ddd3f0 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -357,7 +357,7 @@ static void x264_mb_analyse_init( x264_t *h, x264_mb_analysis_t *a, int i_qp )
     /* mbrd == 2 -> RD refinement */
     /* mbrd == 3 -> QPRD */
     a->i_mbrd = (subme>=6) + (subme>=8) + (h->param.analyse.i_subpel_refine>=10);
-    h->mb.b_deblock_rdo = h->param.analyse.i_subpel_refine >= 9;
+    h->mb.b_deblock_rdo = h->param.analyse.i_subpel_refine >= 9 && h->sh.i_disable_deblocking_filter_idc != 1;
 
     x264_mb_analyse_init_qp( h, a, i_qp );