From 0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 26 Sep 2011 00:51:14 +0200
Subject: [PATCH] win32: improve threading algorithm warning

If no threading is requested do not issue warning about unsupported
threading algorithm.
---
 libavcodec/w32thread.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index 023be0e663..ceaafebc80 100644
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -130,8 +130,10 @@ int ff_thread_init(AVCodecContext *s){
     ThreadContext *c;
     uint32_t threadid;
 
-    if(!(s->thread_type & FF_THREAD_SLICE)){
-        av_log(s, AV_LOG_WARNING, "The requested thread algorithm is not supported with this thread library.\n");
+    if (s->thread_type && !(s->thread_type & FF_THREAD_SLICE)) {
+        av_log(s, AV_LOG_WARNING,
+            "This thread library only supports FF_THREAD_SLICE"
+            " threading algorithm.\n");
         return 0;
     }