From ceaa91f0a15f3446b2be2b179e00985ca520d72c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 28 Mar 2010 19:02:58 +0000
Subject: Add HAVE_STRERROR_R definition for FFmpeg to config.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30976 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index 4852c1f46e..8dfca8e5c9 100755
--- a/configure
+++ b/configure
@@ -9213,6 +9213,7 @@ $def_yasm
 #define HAVE_LDBRX 0
 #define HAVE_POLL_H 1
 #define HAVE_PPC4XX 0
+#define HAVE_STRERROR_R 0
 #define HAVE_SYS_SELECT_H 0
 #define HAVE_VFP_ARGS 1
 #define HAVE_VIRTUALALLOC 0
-- 
cgit v1.2.3


From 1468d39b01b47a5d2044f86e19822feecfffbedd Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 2 Apr 2010 10:13:08 +0000
Subject: Do not try -march=native for icc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30984 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 8dfca8e5c9..60e0a58fc6 100755
--- a/configure
+++ b/configure
@@ -1912,7 +1912,9 @@ cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
   if test "$_runtime_cpudetection" = no ; then
+    if test $cc_vendor != "intel" ; then
     cc_check -march=native && proc=native
+    fi
     if test "$proc" = "k8"; then
       cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp
     fi
@@ -2060,7 +2062,9 @@ int main(void) { return 0; }
 EOF
     # This is a stripped-down version of the i386 fallback.
     if test "$_runtime_cpudetection" = no ; then
+      if test $cc_vendor != "intel" ; then
       cc_check -march=native && proc=native
+      fi
       # --- AMD processors ---
       if test "$proc" = "k8"; then
         cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp
-- 
cgit v1.2.3


From 103ca0c90258999d1f5dbb74c11ac837613a74ba Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 2 Apr 2010 10:13:45 +0000
Subject: Cosmetics: Fix indentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30985 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 60e0a58fc6..29dba495d7 100755
--- a/configure
+++ b/configure
@@ -1913,7 +1913,7 @@ int main(void) { return 0; }
 EOF
   if test "$_runtime_cpudetection" = no ; then
     if test $cc_vendor != "intel" ; then
-    cc_check -march=native && proc=native
+      cc_check -march=native && proc=native
     fi
     if test "$proc" = "k8"; then
       cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp
@@ -2063,7 +2063,7 @@ EOF
     # This is a stripped-down version of the i386 fallback.
     if test "$_runtime_cpudetection" = no ; then
       if test $cc_vendor != "intel" ; then
-      cc_check -march=native && proc=native
+        cc_check -march=native && proc=native
       fi
       # --- AMD processors ---
       if test "$proc" = "k8"; then
-- 
cgit v1.2.3


From 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Apr 2010 16:32:54 +0000
Subject: Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.
 FFmpeg now builds with the software scaler enabled by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31004 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 29dba495d7..76cff01811 100755
--- a/configure
+++ b/configure
@@ -8730,8 +8730,6 @@ CONFIG_LIBXVID_ENCODER=$_xvid_lavc
 CONFIG_MLIB = $_mlib
 CONFIG_MUXERS=$_mencoder
 CONFIG_POSTPROC = yes
-# Prevent building libavcodec/imgresample.c with conflicting symbols
-CONFIG_SWSCALE=yes
 CONFIG_VDPAU=$_vdpau
 CONFIG_XVMC=$_xvmc
 CONFIG_ZLIB=$_zlib
@@ -9200,7 +9198,6 @@ $def_yasm
 #define CONFIG_LIBVORBIS 0
 #define CONFIG_POWERPC_PERF 0
 #define CONFIG_SMALL 0
-#define CONFIG_SWSCALE 1
 #define CONFIG_SWSCALE_ALPHA 1
 
 #if defined(HAVE_AF_INET6) && (!defined(_WIN32) || defined(__CYGWIN__))
-- 
cgit v1.2.3