Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 16:10:27 +0000 (18:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 16:10:47 +0000 (18:10 +0200)
* commit 'e780c3daafe0588e035e752c771ebfcd2201746a':
  pcm-dvd: Fix 20bit decoding

Conflicts:
Changelog

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

Trivial merge