[FFmpeg-cvslog] lavc: protect calls to frame_thread_encoder by HAVE_THREADS

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 29 11:09:36 2012 +0200| [85c830331c36502144e1cc9cf8aa7bd177e1d79d] | committer: Michael Niedermayer

lavc: protect calls to frame_thread_encoder by HAVE_THREADS

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/utils.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b93be5f..99e012a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -873,11 +873,13 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
     if (!HAVE_THREADS)
         av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n");
 
-    entangled_thread_counter--; //we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
-    ret = ff_frame_thread_encoder_init(avctx, options ? *options : NULL);
-    entangled_thread_counter++;
-    if (ret < 0)
-        goto free_and_end;
+    if (HAVE_THREADS) {
+        entangled_thread_counter--; //we will instanciate a few encoders thus kick the counter to prevent false detection of a problem
+        ret = ff_frame_thread_encoder_init(avctx, options ? *options : NULL);
+        entangled_thread_counter++;
+        if (ret < 0)
+            goto free_and_end;
+    }
 
     if (HAVE_THREADS && !avctx->thread_opaque
         && !(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) {
@@ -1336,7 +1338,7 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
 
     *got_packet_ptr = 0;
 
-    if(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))
+    if(HAVE_THREADS && avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))
         return ff_thread_video_encode_frame(avctx, avpkt, frame, got_packet_ptr);
 
     if (!(avctx->codec->capabilities & CODEC_CAP_DELAY) && !frame) {
@@ -1741,7 +1743,7 @@ av_cold int avcodec_close(AVCodecContext *avctx)
     }
 
     if (avcodec_is_open(avctx)) {
-        if (avctx->internal->frame_thread_encoder && avctx->thread_count > 1) {
+        if (HAVE_THREADS && avctx->internal->frame_thread_encoder && avctx->thread_count > 1) {
             entangled_thread_counter --;
             ff_frame_thread_encoder_free(avctx);
             entangled_thread_counter ++;