Module: libav
Branch: master
Commit: 0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Mon Sep 26 00:51:14 2011 +0200
win32: improve threading algorithm warning
If no threading is requested do not issue warning about unsupported
threading algorithm.
---
libavcodec/w32thread.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index 023be0e..ceaafeb 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;
}
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
