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)
* commit '41e1354c101004ccd46dc08d3dd6e956e83a6b51':
  proresenc: Properly account for alpha plane

Conflicts:
libavcodec/proresenc_kostya.c

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

Simple merge