Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 15:01:00 +0000 (16:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 15:01:00 +0000 (16:01 +0100)
commit36099df521b5e26403b3379f8ffafdfb7b9e96c7
tree31ab6ea0b1a66e761d6b1693702681a77859640c
parente92ba51fd78dda1be8b9ab278c869eed6429514d
parent8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb
Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'

* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
  lavu: add a new API for reference-counted data buffers.

Conflicts:
libavutil/Makefile

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