ffmpeg | branch: master | James Zern <jz...@google.com> | Sat Oct 27 13:09:27 2018 -0700| [32d021cfa6520c53da23a10732f9ae9cf28ea948] | committer: James Zern
avcodec/libvpxdec: fix setting auto threads a thread count of 0 is treated the same as 1, use av_cpu_count() to get the correct thread count when auto threads is requested. this matches the fix in libvpxenc: 27df34bf1f avcodec/libvpxenc: fix setting amount of threads used for encoding Reviewed-by: James Almer <jamr...@gmail.com> Signed-off-by: James Zern <jz...@google.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32d021cfa6520c53da23a10732f9ae9cf28ea948 --- libavcodec/libvpxdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 04f27d3396..164dbda49b 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -47,8 +47,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, { VPxContext *ctx = avctx->priv_data; struct vpx_codec_dec_cfg deccfg = { - /* token partitions+1 would be a decent choice */ - .threads = FFMIN(avctx->thread_count, 16) + .threads = FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 16) }; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
