diff options
| author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2012-01-22 13:04:16 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-22 23:26:25 +0100 |
| commit | 4e20ad196d33d957541ac11b3a460ac2971cdc0e (patch) | |
| tree | 594c9e32c24cd9473043307eefac12f40a0d4ecd | |
| parent | d0252d7e39bd8c0b536c53f018661cb56cefb9f6 (diff) | |
ffmpeg: depends on host-nasm if MMX is enabled
[Peter: slightly reordered]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 38f04aafc..dc572de90 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -123,9 +123,14 @@ else FFMPEG_CONF_OPT += --disable-zlib endif +ifeq ($(BR2_i386)$(BR2_x86_64),y) # MMX on is default for x86, disable it for lowly x86-type processors ifeq ($(BR2_x86_i386)$(BR2_x86_i486)$(BR2_x86_i586)$(BR2_x86_i686)$(BR2_x86_pentiumpro)$(BR2_x86_geode),y) FFMPEG_CONF_OPT += --disable-mmx +else +# If it is enabled, nasm is required +FFMPEG_DEPENDENCIES += host-nasm +endif endif # ARM defaults to v5: clear if less, add extra if more |