diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-08 16:01:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-08 16:01:00 +0100 |
| commit | 36099df521b5e26403b3379f8ffafdfb7b9e96c7 (patch) | |
| tree | 31ab6ea0b1a66e761d6b1693702681a77859640c /libavformat/mux.c | |
| parent | e92ba51fd78dda1be8b9ab278c869eed6429514d (diff) | |
| parent | 8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb (diff) | |
Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
lavu: add a new API for reference-counted data buffers.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions