godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-05 14:09:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: consolidate duplicated config options

Browse Source 
Commit 62ab07ef76 added a bunch
of hard-coded options.  Some of these options are then again
added (or negated) based on kconfig settings.  This patch removes
the hard coded swscale and postproc settings, as they are enabled
or disabled later.  It also moves the --disable-pic lower
as an else clause to the part that adds --enable-pic.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Danomi Manchego
2014-09-08 22:06:44 -04:00
committed by Thomas Petazzoni
parent 547b3bb337
commit 255aab75fc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/ffmpeg/ffmpeg.mk
View File

@@ -22,15 +22,12 @@ FFMPEG_CONF_OPT = \
--disable-debug \
--disable-version3 \
--enable-logging \
--disable-pic \
--enable-optimizations \
--disable-extra-warnings \
--disable-ffprobe \
--enable-avdevice \
--enable-avcodec \
--enable-avformat \
--enable-swscale \
--enable-postproc \
--disable-x11grab \
--enable-network \
--disable-gray \
@@ -311,6 +308,8 @@ endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
FFMPEG_CONF_OPT += --enable-pic
else
FFMPEG_CONF_OPT += --disable-pic
endif
FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))