Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:14:12 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:15:01 +0000 (12:15 +0100)
commit0e85a28fa434385d6a0465bf44b95f8820683f56
treed7ef6356eecaad48d6fec72e311b809768b7d923
parent79f77ce31c6cbe2c8c1163862acdaf2014a85458
parent51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb
Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'

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

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