summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2016-09-03 01:04:57 -0400
committerBradley Sepos <[email protected]>2016-09-03 01:29:08 -0400
commit783d0958f5c6a558459b14abef82c5bb34547a63 (patch)
tree456d26eb641354e4fd90d997f12e3905eb42cd61 /contrib/ffmpeg
parented0be87a9c8a6989b2b45f7b4135a0b2401c0756 (diff)
contrib: Libav module cosmetics.
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs20
1 files changed, 9 insertions, 11 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index bb27b953d..44cb98aad 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -21,7 +21,7 @@ FFMPEG.CONFIGURE.deps =
FFMPEG.CONFIGURE.host =
FFMPEG.CONFIGURE.build =
FFMPEG.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
FFMPEG.CONFIGURE.extra = \
--enable-gpl \
@@ -100,21 +100,19 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
endif
ifneq (none,$(FFMPEG.GCC.g))
- FFMPEG.CONFIGURE.extra += --enable-debug
-
-ifeq (max,$(FFMPEG.GCC.g))
- FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DDEBUG"
-else
- FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DNDEBUG"
-endif
-
+ FFMPEG.CONFIGURE.extra += --enable-debug
+ ifeq (max,$(FFMPEG.GCC.g))
+ FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DDEBUG"
+ else
+ FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DNDEBUG"
+ endif
else
- FFMPEG.CONFIGURE.extra += --disable-debug
+ FFMPEG.CONFIGURE.extra += --disable-debug
FFMPEG.CONFIGURE.extra += --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) -DNDEBUG"
endif
ifeq (none,$(FFMPEG.GCC.O))
- FFMPEG.CONFIGURE.extra += --disable-optimizations
+ FFMPEG.CONFIGURE.extra += --disable-optimizations
endif
ifeq (1,$(FEATURE.qsv))