Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:01:14 +0000 (20:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 18:01:14 +0000 (20:01 +0200)
commit43b769b0c4f438d3f261d53f7fbd23e28606e78a
treeca63a9d92896b2d540eeaa375119c0ec0d0fa390
parent3f0c76e26205f867b089ac56d7cb14bf8d984ef0
parentb16699f2da9c1d41eff852ec3a0c81f74fd44421
Merge commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421'

* commit 'b16699f2da9c1d41eff852ec3a0c81f74fd44421':
  proresenc: Remove unneeded parameters from encode_alpha_plane()

Conflicts:
libavcodec/proresenc_kostya.c

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