Merge commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:05:07 +0000 (15:05 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:05:07 +0000 (15:05 +0100)
commit2818aaaba09da380639a1ed51e4f3ece8cb3b2ec
tree00fb0a579a88c7abc60abb026f801201cd0eecbe
parent711b7b77763cd55d5584ae82ce5cae6d4718092d
parent5f74bd31a9bd1ac7655103b11743c12d38e0419f
Merge commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f'

* commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f':
  vp8/armv6: mc: avoid boolean expression in calculation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/arm/vp8dsp_armv6.S