| Message ID | 1410228406-2140-1-git-send-email-danomimanchego123@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Danomi Manchego, On Mon, 8 Sep 2014 22:06:44 -0400, Danomi Manchego wrote: > Commit 62ab07ef769bd6504fe1db144aaac3fd45db9dad 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> > --- > package/ffmpeg/ffmpeg.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Applied, thanks. Thomas
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 6771309..2c52183 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -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 \ @@ -312,6 +309,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))
Commit 62ab07ef769bd6504fe1db144aaac3fd45db9dad 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> --- package/ffmpeg/ffmpeg.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)