[FFmpeg-cvslog] win32: improve threading algorithm warning
Luca Barbato
git at videolan.org
Mon Oct 3 01:17:03 CEST 2011
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Sep 26 00:51:14 2011 +0200| [0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f] | committer: Luca Barbato
win32: improve threading algorithm warning
If no threading is requested do not issue warning about unsupported
threading algorithm.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e5cc174bb0f0dfb99bd4969bb1d6c20de3d6e7f
---
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;
}
More information about the ffmpeg-cvslog
mailing list