-
Michael Niedermayer authored
* commit '41e1354c': proresenc: Properly account for alpha plane Conflicts: libavcodec/proresenc_kostya.c See: 117bc8e6Merged-by: Michael Niedermayer <michaelni@gmx.at>
cdd0ad7b
* commit '41e1354c': proresenc: Properly account for alpha plane Conflicts: libavcodec/proresenc_kostya.c See: 117bc8e6Merged-by: Michael Niedermayer <michaelni@gmx.at>