Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 15:05:59 +0000 (16:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 15:06:20 +0000 (16:06 +0100)
commit532f31a695c9530ce67a847be00d72e6e8acfd11
treeaa78d9b5840629c23ab2aaf94079930eca8e8c02
parent36099df521b5e26403b3379f8ffafdfb7b9e96c7
parent1cec0624d0e6f48590283a57169b58b9fe8449d3
Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'

* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
  AVBuffer: add a new API for buffer pools

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/buffer.c
libavutil/buffer.h
libavutil/buffer_internal.h