[FFmpeg-cvslog] Merge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 20:33:47 2017 -0300| [7116e6894b47220f5e0d1b589bfbeeb6936412d3] | committer: James Almer

Merge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'

* commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6':
  configure: Add x86 dependency for mmx_internal

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7116e6894b47220f5e0d1b589bfbeeb6936412d3
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 231b4c75fa..fe1c8f7dbd 100755
--- a/configure
+++ b/configure
@@ -2366,7 +2366,7 @@ fma4_deps="avx"
 avx2_deps="avx"
 
 mmx_external_deps="x86asm"
-mmx_inline_deps="inline_asm"
+mmx_inline_deps="inline_asm x86"
 mmx_suggest="mmx_external mmx_inline"
 
 for ext in $(filter_out mmx $ARCH_EXT_LIST_X86_SIMD); do


======================================================================