ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Apr 4 01:58:37 2015 +0200| [333eb37a967a6e5299e63adaadec3bb9b8b2bbbd] | committer: Michael Niedermayer
avcodec/h264: silence ER warning when no slice threads are used Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=333eb37a967a6e5299e63adaadec3bb9b8b2bbbd --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 11f1055..62cb241 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"); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
