Skip to contentSkip to conversation

ffmpeg: let the user override the --cpu value

PATCH New Vicente Olivert Riera 3 participants 3 messages Oct 15, 2015 – Oct 17, 2015

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 ffmpeg: let the user override the --cpu value

Grab the content of BR2_PACKAGE_FFMPEG_EXTRACONF after guessing the CPU, so the user will still have the possibility to override it.

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/ffmpeg/ffmpeg.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/ffmpeg/ffmpeg.mk +2 -2
index f361970..ec260de 100644
@@ -421,14 +421,14 @@ else
 FFMPEG_CONF_OPTS += --disable-pic
 endif
 
-FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
-
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU)
 else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
 endif
 
+FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
+
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
 define FFMPEG_CONFIGURE_CMDS
 	(cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 ffmpeg: let the user override the --cpu value

Am Thu, 15 Oct 2015 13:22:55 +0100 schrieb Vicente Olivert Riera:

Quoted 2 lines

Grab the content of BR2_PACKAGE_FFMPEG_EXTRACONF after guessing the CPU, so the user will still have the possibility to override it.

Reviewed-by Bernd Kuhls <[email protected]>
Applied
#2 lore raw

PATCH 1/1 ffmpeg: let the user override the --cpu value

In reply to Vicente Olivert Riera

Dear Vicente Olivert Riera,

Quoted 7 lines · Vicente Olivert Riera

Grab the content of BR2_PACKAGE_FFMPEG_EXTRACONF after guessing the CPU, so the user will still have the possibility to override it.

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/ffmpeg/ffmpeg.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com