Merge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:55:12 +0000 (23:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:55:12 +0000 (23:55 +0100)
* commit '23fe589e19487bc9a40b77dae9509068da5b14b8':
  prores: Evaluate all the quantizers

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

Simple merge