Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:45:00 +0000 (02:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Aug 2014 00:45:00 +0000 (02:45 +0200)
commit35fe089dd9b667bb5e7537b35a0d03b6bcb01b0c
tree5c4bdb61ca0673b0644ad904740acaf39964b1db
parent9e6d8c309f2763364ca2aaab801963a302bdfe82
parentb3f48a5044fd04539337e91d28022207c9d3b9e8
Merge commit 'b3f48a5044fd04539337e91d28022207c9d3b9e8' into release/2.2

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

Conflicts:
libavcodec/proresenc_kostya.c

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