diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:10:53 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 16:12:25 +0000 |
| commit | 1a708780f3d4b431996d118df4e448b4f2a7942e (patch) | |
| tree | dc389307bc577b231d25c75aed9eadec125bfc38 /libavutil/Makefile | |
| parent | 26abd5149ebf9602d8036be4c6e72e08c98ea998 (diff) | |
| parent | 89923e418b494e337683442ab896d754bc07341a (diff) | |
| download | ffmpeg-1a708780f3d4b431996d118df4e448b4f2a7942e.tar.gz | |
Merge commit '89923e418b494e337683442ab896d754bc07341a'
* commit '89923e418b494e337683442ab896d754bc07341a':
lavu: add a framework for handling hwaccel frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 65b2d25877..cec5584684 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -31,6 +31,7 @@ HEADERS = adler32.h \ frame.h \ hash.h \ hmac.h \ + hwcontext.h \ imgutils.h \ intfloat.h \ intreadwrite.h \ @@ -108,6 +109,7 @@ OBJS = adler32.o \ frame.o \ hash.o \ hmac.o \ + hwcontext.o \ imgutils.o \ integer.o \ intmath.o \ |