From 9c846b3df6ff206f59364b2d5ae511c293d8e44a Mon Sep 17 00:00:00 2001
From: lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 29 Nov 2009 05:18:40 +0000
Subject: sync to x264-r1327. (only needed for x264-in-libavcodec)

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

(limited to 'configure')

diff --git a/configure b/configure
index c2b3de83da..8092e75d61 100755
--- a/configure
+++ b/configure
@@ -7237,7 +7237,7 @@ if test "$_x264" = auto ; then
   cat > $TMPC << EOF
 #include <inttypes.h>
 #include <x264.h>
-#if X264_BUILD < 78
+#if X264_BUILD < 79
 #error We do not support old versions of x264. Get the latest from git.
 #endif
 int main(void) { x264_encoder_open((void*)0); return 0; }
-- 
cgit v1.2.3


From e0b789ec7bf2a23d6bb640f7635649d9a1c3d98f Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 9 Dec 2009 17:55:34 +0000
Subject: Disable winsock when we already found a working socklib instead of
 checking blindly for cygwin and uselessly running the check on e.g. Linux.

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

(limited to 'configure')

diff --git a/configure b/configure
index 8092e75d61..16049ced48 100755
--- a/configure
+++ b/configure
@@ -3050,7 +3050,8 @@ _socklib=no
 for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do
   cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break
 done
-if test $_winsock2_h = auto && ! cygwin ; then
+test $_socklib = yes && test $_winsock2_h = auto && _winsock2_h=no
+if test $_winsock2_h = auto ; then
   _winsock2_h=no
   cat > $TMPC << EOF
 #include <winsock2.h>
-- 
cgit v1.2.3