Fix configure libavformat / libavcodec

Improve #ifdef for not i386 / x86_64 for emms
sackmotion · Mar 18, 2014 · ad7e243 · ad7e243
1 parent 28b7cb2
commit ad7e243
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54.
+# Generated by GNU Autoconf 2.69 for motion Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='motion'
 PACKAGE_TARNAME='motion'
-PACKAGE_VERSION='Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54'
-PACKAGE_STRING='motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54'
+PACKAGE_VERSION='Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0'
+PACKAGE_STRING='motion Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1245,7 +1245,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54 to adapt to many kinds of systems.
+\`configure' configures motion Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1306,7 +1306,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54:";;
+     short | recursive ) echo "Configuration of motion Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0:";;
    esac
   cat <<\_ACEOF
 
@@ -1454,7 +1454,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-motion configure Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54
+motion configure Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2056,7 +2056,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by motion $as_me Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54, which was
+It was created by motion $as_me Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4334,7 +4334,7 @@ $as_echo "found in /usr/local/lib" >&6; }
 		FFMPEG_OK="found"
 		FFMPEG_LIB="/usr/local/lib"
 		FFMPEG_DIR="/usr/local"
-    elif test -f /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so && test /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so ; then
+    elif test -f /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so && test /usr/lib/x86_64-linux-gnu/libavformat.a -o -f /usr/lib/x86_64-linux-gnu/libavformat.so ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in /usr/lib/x86_64-linux-gnu" >&5
 $as_echo "found in /usr/lib/x86_64-linux-gnu" >&6; }
         FFMPEG_OK="found"
@@ -6605,7 +6605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by motion $as_me Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54, which was
+This file was extended by motion $as_me Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6667,7 +6667,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-motion config.status Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54
+motion config.status Git-28b7cb2a4297c78b9c08c9ce29a648aeb22120d0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.in b/configure.in
@@ -426,7 +426,7 @@ else if test "${FFMPEG_DIR}" = "yes"; then
 		FFMPEG_OK="found"
 		FFMPEG_LIB="/usr/local/lib"
 		FFMPEG_DIR="/usr/local"
-    elif test -f /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so && test /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so ; then
+    elif test -f /usr/lib/x86_64-linux-gnu/libavcodec.a -o -f /usr/lib/x86_64-linux-gnu/libavcodec.so && test /usr/lib/x86_64-linux-gnu/libavformat.a -o -f /usr/lib/x86_64-linux-gnu/libavformat.so ; then
         AC_MSG_RESULT(found in /usr/lib/x86_64-linux-gnu)
         FFMPEG_OK="found"
         FFMPEG_LIB="/usr/lib/x86_64-linux-gnu"

diff --git a/ffmpeg.c b/ffmpeg.c
@@ -1000,7 +1000,7 @@ void ffmpeg_deinterlace(unsigned char *img, int width, int height)
     /* We assume using 'PIX_FMT_YUV420P' always */
     avpicture_deinterlace(&picture, &picture, PIX_FMT_YUV420P, width, height);
 
-#ifndef __SSE_MATH__
+#if !defined(__SSE_MATH__) && (defined(__i386__) || defined(__x86_64__))
     __asm__ __volatile__ ( "emms");
 #endif