[FFmpeg-cvslog] Fix build with threading disabled

Mans Rullgard git
Fri Feb 11 03:52:12 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed Feb  9 20:15:25 2011 +0000| [ee5bb31f9953d356c5caa08bd16451d017780759] | committer: Michael Niedermayer

Fix build with threading disabled

The avcodec_thread_free() compatibility wrapper calls ff_thread_free(),
which is not defined when threading is disabled.  Make this call
conditional.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 9a77a92c2b6855781d2a4cfab14c67ae4025760c)

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

 libavcodec/utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 404bf47..8e5cfd5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1339,7 +1339,9 @@ int avcodec_thread_init(AVCodecContext *s, int thread_count)
 
 void avcodec_thread_free(AVCodecContext *s)
 {
+#if HAVE_THREADS
     return ff_thread_free(s);
+#endif
 }
 
 #endif




More information about the ffmpeg-cvslog mailing list