[x264-devel] commit: Fix another 10l in MBtree (Jason Garrett-Glaser )

git version control git at videolan.org
Sun Aug 9 08:08:35 CEST 2009


x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sat Aug  8 23:07:30 2009 -0700| [22446fccdebaafcd3ee237a50fb45fc6acbd983c] | committer: Jason Garrett-Glaser 

Fix another 10l in MBtree
This is getting embarrassing...

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

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

diff --git a/encoder/slicetype.c b/encoder/slicetype.c
index e4754b6..f67fa1c 100644
--- a/encoder/slicetype.c
+++ b/encoder/slicetype.c
@@ -403,7 +403,7 @@ static int x264_slicetype_frame_cost_recalculate( x264_t *h, x264_mb_analysis_t
 static void x264_macroblock_tree_propagate( x264_t *h, x264_frame_t **frames, int p0, int p1, int b )
 {
     x264_frame_t *refs[2] = {frames[p0],frames[p1]};
-    int dist_scale_factor = p1 != p0 ? 128 : ( ((b-p0) << 8) + ((p1-p0) >> 1) ) / (p1-p0);
+    int dist_scale_factor = p1 == p0 ? 128 : ( ((b-p0) << 8) + ((p1-p0) >> 1) ) / (p1-p0);
     int i_bipred_weight = h->param.analyse.b_weighted_bipred ? 64 - (dist_scale_factor>>2) : 32;
 
     for( h->mb.i_mb_y = 0; h->mb.i_mb_y < h->sps->i_mb_height; h->mb.i_mb_y++ )



More information about the x264-devel mailing list