Merge changes I59ef7c49,I0156d856

* changes:
  Made MACROBLOCK.increase_denoising cond-compiled
  s/INT_MAX/UINT_MAX/ where appropriate