]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f':
  vp8/armv6: mc: avoid boolean expression in calculation

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

Simple merge