diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 15:52:05 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-09 16:25:28 +0100 |
| commit | ca5ec2bf51d8c4f8bb0a829d0a65c70c968888a3 (patch) | |
| tree | a1a466cd3186398946e522ecac62ef1e2d85d1b2 /libavutil | |
| parent | 1a3cff4f7eadad5292b6d65f751b0273d3a4124a (diff) | |
| parent | 01621202aad7e27b2a05c71d9ad7a19dfcbe17ec (diff) | |
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index a91e7019b3..a35deb6fec 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -22,6 +22,7 @@ HEADERS = adler32.h \ cpu.h \ crc.h \ des.h \ + dict.h \ display.h \ downmix_info.h \ error.h \ @@ -47,7 +48,6 @@ HEADERS = adler32.h \ mem.h \ motion_vector.h \ murmur3.h \ - dict.h \ opt.h \ parseutils.h \ pixdesc.h \ @@ -55,8 +55,8 @@ HEADERS = adler32.h \ pixfmt.h \ random_seed.h \ rc4.h \ - replaygain.h \ rational.h \ + replaygain.h \ ripemd.h \ samplefmt.h \ sha.h \ @@ -100,6 +100,7 @@ OBJS = adler32.o \ cpu.o \ crc.o \ des.o \ + dict.o \ display.o \ downmix_info.o \ error.o \ @@ -125,7 +126,6 @@ OBJS = adler32.o \ md5.o \ mem.o \ murmur3.o \ - dict.o \ opt.o \ parseutils.o \ pixdesc.o \ @@ -151,9 +151,9 @@ OBJS = adler32.o \ OBJS-$(!HAVE_ATOMICS_NATIVE) += atomic.o \ +OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_OPENCL) += opencl.o opencl_internal.o -OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o |