From: Mans Rullgard Date: Wed, 9 Feb 2011 20:15:25 +0000 (+0000) Subject: Fix build with threading disabled X-Git-Tag: android-x86-4.4-r1~12310^2~2271 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a77a92c2b6855781d2a4cfab14c67ae4025760c;p=android-x86%2Fexternal-ffmpeg.git 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 --- diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0816b39cda..03018b894f 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