Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:27:41 +0000 (20:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:27:41 +0000 (20:27 +0200)
commitcdd0ad7be1f94c4c44219d8afecb6a3e1c23041b
treec53f1281f5c458ec35870543a5fbeac9823299f5
parente348a81a66851e35b9f6facf70c678e886bd3805
parent41e1354c101004ccd46dc08d3dd6e956e83a6b51
Merge commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51'

* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
  proresenc: Properly account for alpha plane

Conflicts:
libavcodec/proresenc_kostya.c

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