aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/g723_1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-08 16:01:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-08 16:01:00 +0100
commit36099df521b5e26403b3379f8ffafdfb7b9e96c7 (patch)
tree31ab6ea0b1a66e761d6b1693702681a77859640c /libavformat/g723_1.c
parente92ba51fd78dda1be8b9ab278c869eed6429514d (diff)
parent8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb (diff)
downloadffmpeg-36099df521b5e26403b3379f8ffafdfb7b9e96c7.tar.gz
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>
Diffstat (limited to 'libavformat/g723_1.c')
0 files changed, 0 insertions, 0 deletions