[FFmpeg-cvslog] Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
James Almer
git at videolan.org
Thu Mar 23 23:21:10 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 18:20:29 2017 -0300| [78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2] | committer: James Almer
Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
build: Add VSX-OBJS to SUBDIR_VARS
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 72c9593..f8ddb99 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ config.h: .config
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
- ALTIVEC-OBJS MMX-OBJS YASM-OBJS \
+ ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
======================================================================
diff --cc Makefile
index 72c9593,34f0c9c..f8ddb99
--- a/Makefile
+++ b/Makefile
@@@ -88,9 -130,8 +88,9 @@@ config.h: .confi
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
- ALTIVEC-OBJS MMX-OBJS YASM-OBJS \
+ ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS \
- OBJS HOSTOBJS TESTOBJS
+ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
+ MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
define RESET
$(1) :=
More information about the ffmpeg-cvslog
mailing list