From 333eb37a967a6e5299e63adaadec3bb9b8b2bbbd Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 4 Apr 2015 01:58:37 +0200
Subject: [PATCH] avcodec/h264: silence ER warning when no slice threads are
used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/h264.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 11f10558825..62cb241b86c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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");
--
GitLab