shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove unnecessary pointer check

The original implementation had the following comment:
// Ignore mv costing if mvsadcost is NULL

However the current implementation does not allow for this.
If x exists then nmvsadcost must not be null.

This removes the only warning from -Wpointer-bool-conversion

https://code.google.com/p/webm/issues/detail?id=894

Change-Id: I1a2cee340d7972d41e1bbbe1ec8dfbe917667085

--- a/vp9/encoder/vp9_mcomp.c

+++ b/vp9/encoder/vp9_mcomp.c

@@ -90,13 +90,10 @@

 static int mvsad_err_cost(const MACROBLOCK *x, const MV *mv, const MV *ref,

                           int error_per_bit) {

-  if (x->nmvsadcost) {

-    const MV diff = { mv->row - ref->row,

-                      mv->col - ref->col };

-    return ROUND_POWER_OF_TWO(mv_cost(&diff, x->nmvjointsadcost,

-                                      x->nmvsadcost) * error_per_bit, 8);

-  }

-  return 0;

+  const MV diff = { mv->row - ref->row,

+                    mv->col - ref->col };

+  return ROUND_POWER_OF_TWO(mv_cost(&diff, x->nmvjointsadcost,

+                                    x->nmvsadcost) * error_per_bit, 8);

 }

 void vp9_init_dsmotion_compensation(search_site_config *cfg, int stride) {