* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3': AVBuffer: add a new API for buffer pools Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb': lavu: add a new API for reference-counted data buffers. Conflicts: libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>