Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'

[ffmpeg] / configure

diff --git a/configure b/configure
index 2604ae7bb43a4621ddd64cbe3f1c1485a4a78125..bc010d5629b5147ccb8e26702ec212f45f436c01 100755 (executable)
--- a/configure
+++ b/configure
@@ -4359,6 +4359,7 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then
     elif ! check_func pthread_join && ! check_func pthread_create; then
         disable pthreads
     fi
+    check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads
 fi
 
 for thread in $THREADS_LIST; do
@@ -5057,7 +5058,7 @@ cat > $TMPH <<EOF
 #define FFMPEG_CONFIG_H
 #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 #define FFMPEG_LICENSE "$(c_escape $license)"
-#define CONFIG_THIS_YEAR 2013
+#define CONFIG_THIS_YEAR 2014
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define AVCONV_DATADIR "$(eval c_escape $datadir)"
 #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"