[FFmpeg-cvslog] lavu/Makefile: Fix alignment and ordering
Mark Thompson
git at videolan.org
Wed May 16 00:21:44 EEST 2018
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Mon May 14 22:58:57 2018 +0100| [989c5a84acffa327cc3daf90c2e4226cf2174481] | committer: Mark Thompson
lavu/Makefile: Fix alignment and ordering
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=989c5a84acffa327cc3daf90c2e4226cf2174481
---
libavutil/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavutil/Makefile b/libavutil/Makefile
index a63ba523c9..4fe470748c 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -160,14 +160,14 @@ OBJS = adler32.o \
OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o
OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o
OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o
-OBJS-$(CONFIG_QSV) += hwcontext_qsv.o
OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o
OBJS-$(CONFIG_LZO) += lzo.o
+OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o
OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o
+OBJS-$(CONFIG_QSV) += hwcontext_qsv.o
OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o
OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o
OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o
-OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o
OBJS += $(COMPAT_OBJS:%=../compat/%)
@@ -178,7 +178,7 @@ SKIPHEADERS-$(HAVE_CUDA_H) += hwcontext_cuda.h
SKIPHEADERS-$(CONFIG_CUDA) += hwcontext_cuda_internal.h
SKIPHEADERS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.h
SKIPHEADERS-$(CONFIG_DXVA2) += hwcontext_dxva2.h
-SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h
+SKIPHEADERS-$(CONFIG_QSV) += hwcontext_qsv.h
SKIPHEADERS-$(CONFIG_OPENCL) += hwcontext_opencl.h
SKIPHEADERS-$(CONFIG_VAAPI) += hwcontext_vaapi.h
SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.h
More information about the ffmpeg-cvslog
mailing list