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)
* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
  AVBuffer: add a new API for buffer pools

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

Simple merge
Simple merge
Simple merge