[FFmpeg-cvslog] configure: Fix miscompilation for i586

Mikulas Patocka git at videolan.org
Mon Jun 1 13:42:26 CEST 2015


ffmpeg | branch: release/2.2 | Mikulas Patocka <mikulas at artax.karlin.mff.cuni.cz> | Fri Sep 12 22:29:29 2014 +0200| [7c9870d3f7c1ec45f5b46506983cf6ffbb2f0ad0] | committer: Michael Niedermayer

configure: Fix miscompilation for i586

If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cdb3eee7c496f763d195de34be7f67783b98fb2c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure |    1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index d1a675a..5b8d2ef 100755
--- a/configure
+++ b/configure
@@ -3585,6 +3585,7 @@ elif enabled x86; then
     case $cpu in
         i[345]86|pentium)
             cpuflags="-march=$cpu"
+            disable i686
             disable mmx
         ;;
         # targets that do NOT support nopl and conditional mov (cmov)



More information about the ffmpeg-cvslog mailing list