Commit 333eb37a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/h264: silence ER warning when no slice threads are used

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 893e6173
......@@ -705,7 +705,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
if (h->enable_er < 0 && (avctx->active_thread_type & FF_THREAD_SLICE))
h->enable_er = 0;
if (h->enable_er) {
if (h->enable_er && (avctx->active_thread_type & FF_THREAD_SLICE)) {
av_log(avctx, AV_LOG_WARNING,
"Error resilience with slice threads is enabled. It is unsafe and unsupported and may crash. "
"Use it at your own risk\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment