diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-02-09 20:15:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-11 02:54:08 +0100 |
| commit | ee5bb31f9953d356c5caa08bd16451d017780759 (patch) | |
| tree | 1677c009b9b4c028472ce69b53c67f136ea01ba3 | |
| parent | 74711b72cc43070e9e29106db03bc60ab132e4cf (diff) | |
| download | ffmpeg-ee5bb31f9953d356c5caa08bd16451d017780759.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>
(cherry picked from commit 9a77a92c2b6855781d2a4cfab14c67ae4025760c)
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 404bf47215..8e5cfd5a82 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 |