summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-02-09 20:15:25 +0000
committerMans Rullgard <mans@mansr.com>2011-02-09 20:52:28 +0000
commit9a77a92c2b6855781d2a4cfab14c67ae4025760c (patch)
tree5d0fa5eeb83e1d8cb7ddae960441b467661b16bd /libavcodec
parentaef669cdfd984a737ad876b33ee1b160f87f5f9a (diff)
downloadffmpeg-streaming-9a77a92c2b6855781d2a4cfab14c67ae4025760c.zip
ffmpeg-streaming-9a77a92c2b6855781d2a4cfab14c67ae4025760c.tar.gz
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@mansr.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0816b39..03018b8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1297,7 +1297,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
OpenPOWER on IntegriCloud