[FFmpeg-cvslog] Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 18:10:27 2014 +0200| [0008a87cb14b7b5932d58578f06489dce5ef9484] | committer: Michael Niedermayer

Merge commit 'e780c3daafe0588e035e752c771ebfcd2201746a' into release/2.2

* commit 'e780c3daafe0588e035e752c771ebfcd2201746a':
  pcm-dvd: Fix 20bit decoding

Conflicts:
	Changelog

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

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