[FFmpeg-cvslog] Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 12:14:12 2014 +0100| [0e85a28fa434385d6a0465bf44b95f8820683f56] | committer: Michael Niedermayer

Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'

* commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb':
  vc1: Use the correct shift amount

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

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