]> granicus.if.org Git - libvpx/commitdiff
Merge changes I3950c883,I2b679b04
authorJames Zern <jzern@google.com>
Tue, 15 Nov 2016 23:41:18 +0000 (23:41 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Nov 2016 23:41:18 +0000 (23:41 +0000)
* changes:
  partial_idct_test: use <limits> for int16_min/max
  vpx_timer.h,x86.h: define NOMINMAX for windows.h


Trivial merge