[FFmpeg-cvslog] Merge commit '9880a0d4b131ef36694d62f78060350a81f08b80'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  9 16:43:10 2014 +0200| [8a21613821fd0a4fb4ccd21ca7d7f02d4f616f22] | committer: Michael Niedermayer

Merge commit '9880a0d4b131ef36694d62f78060350a81f08b80'

* commit '9880a0d4b131ef36694d62f78060350a81f08b80':
  pcm-dvd: Fix 20bit decoding

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

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