[FFmpeg-cvslog] Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 26 20:53:48 2014 +0200| [ecf552657889005d05c3a0a2443dbf29590493d1] | committer: Michael Niedermayer

Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'

* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecf552657889005d05c3a0a2443dbf29590493d1
---