aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-09-26 00:51:14 +0200
committerLuca Barbato <lu_zero@gentoo.org>2011-10-02 08:58:08 +0200
commit0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f (patch)
tree601e43bada0fabc68c9e76fabb3968c1a3cecca2
parentb036a7180cf1f4926084d2f5b7ede09a041f309b (diff)
downloadffmpeg-0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f.tar.gz
win32: improve threading algorithm warning
If no threading is requested do not issue warning about unsupported threading algorithm.
-rw-r--r--libavcodec/w32thread.c6
1 files 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;
}