diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:12:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:12:30 +0200 |
| commit | ef1d4ee2f8b621a009d482d5b183a905bcb1cd74 (patch) | |
| tree | 88d5e961383f04d5c1e521242dc2e0ceb7eedd1b /libavutil/Makefile | |
| parent | af72f62d7b2ab00d6f69c0838f662beb566862d8 (diff) | |
| parent | bddd8cbf68551f6405b2bf77cc3e212af9fbe834 (diff) | |
| download | ffmpeg-ef1d4ee2f8b621a009d482d5b183a905bcb1cd74.tar.gz | |
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
Add transformation matrix API.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h
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 a345024722..8832715909 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -19,6 +19,7 @@ HEADERS = adler32.h \ common.h \ cpu.h \ crc.h \ + display.h \ downmix_info.h \ error.h \ eval.h \ @@ -82,6 +83,7 @@ OBJS = adler32.o \ cpu.o \ crc.o \ des.o \ + display.o \ downmix_info.o \ error.o \ eval.o \ |