[FFmpeg-cvslog] Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 26 20:47:11 2014 +0200| [bde8eb7fa33d16cbba0705a18205df4257351e22] | committer: Michael Niedermayer

Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

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

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