Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 09:32:53 +0000 (11:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 09:32:58 +0000 (11:32 +0200)
commitf0b9bd807b15757587254153bdea7b3898985c9c
tree4fed4cabae462f2bdc6d4f331faf109680a81b9e
parent7de8a38160d86edccfbfb770a25301cde8d6d6e4
parent0b0953baecc5b0f8a85169c6bcc3db69a73f2205
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresenc: alpha coding support

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