Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 18:53:48 +0000 (20:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 18:55:00 +0000 (20:55 +0200)
* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge