Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 20:04:28 +0000 (22:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 20:04:37 +0000 (22:04 +0200)
commit8d31b22869f6a676fe4d1e34d74c0fa3b081421c
tree64f1d91ebd8974a383a66d17cefd9c6a77465d13
parent400810abee8fdf1a58ea852065b08e8ce1ca70c4
parent0a51c7d42a519c63178a4f3e35b8967f21da3a6a
Merge commit '0a51c7d42a519c63178a4f3e35b8967f21da3a6a'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/proresenc_kostya.c