diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 16:01:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 16:01:00 +0100 |
| commit | 36099df521b5e26403b3379f8ffafdfb7b9e96c7 (patch) | |
| tree | 31ab6ea0b1a66e761d6b1693702681a77859640c /libavutil/Makefile | |
| parent | e92ba51fd78dda1be8b9ab278c869eed6429514d (diff) | |
| parent | 8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb (diff) | |
| download | ffmpeg-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 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 4a36757e8b..e7bb7f08fc 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -14,6 +14,7 @@ HEADERS = adler32.h \ blowfish.h \ bprint.h \ bswap.h \ + buffer.h \ channel_layout.h \ common.h \ cpu.h \ @@ -65,6 +66,7 @@ OBJS = adler32.o \ base64.o \ blowfish.o \ bprint.o \ + buffer.o \ channel_layout.o \ cpu.o \ crc.o \ |