[FFmpeg-cvslog] Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 23 22:04:28 2015 +0200| [8d31b22869f6a676fe4d1e34d74c0fa3b081421c] | committer: Michael Niedermayer

Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'

* commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a':
  prores: Set the bits_per_coded_sample for alpha pix_fmt

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

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