[FFmpeg-cvslog] avformat/async: Allow compilation with native threads.

Matt Oliver git at videolan.org
Wed Sep 30 06:25:00 CEST 2015


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Wed Sep 30 13:41:53 2015 +1000| [3b03bde46e331aa301bd16c6c6e94c11e073e8f8] | committer: Matt Oliver

avformat/async: Allow compilation with native threads.

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

 configure           |    2 +-
 libavformat/async.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 01f1797..361c024 100755
--- a/configure
+++ b/configure
@@ -2693,7 +2693,7 @@ x11grab_indev_deps="x11grab"
 x11grab_xcb_indev_deps="libxcb"
 
 # protocols
-async_protocol_deps="pthreads"
+async_protocol_deps="threads"
 bluray_protocol_deps="libbluray"
 ffrtmpcrypt_protocol_deps="!librtmp_protocol"
 ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl"
diff --git a/libavformat/async.c b/libavformat/async.c
index 003212d..a01673d 100644
--- a/libavformat/async.c
+++ b/libavformat/async.c
@@ -34,9 +34,9 @@
 #include "libavutil/fifo.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "libavutil/thread.h"
 #include "url.h"
 #include <stdint.h>
-#include <pthread.h>
 
 #if HAVE_UNISTD_H
 #include <unistd.h>



More information about the ffmpeg-cvslog mailing list