From 5edd1f62ca15ad34705789f155f68ca18914d0f4 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Sat, 23 Jan 2016 10:12:30 +0100 Subject: [PATCH] avcodec: only warn about hwaccel with frame threads VLC uses hwaccel with frame threads and it works fine, but returning an error here made it fail. This regression was introduced in commit 31741ae. Signed-off-by: Andreas Cadhalpun Warning message text by nevcairiel Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ee7367089f..53c0c2281f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1016,9 +1016,8 @@ static int setup_hwaccel(AVCodecContext *avctx, int ret = 0; if (avctx->active_thread_type & FF_THREAD_FRAME) { - av_log(avctx, AV_LOG_ERROR, - "Hardware accelerated decoding with frame threading is not supported.\n"); - return AVERROR(EINVAL); + av_log(avctx, AV_LOG_WARNING, + "Hardware accelerated decoding with frame threading is known to be unstable and its use is discourage.\n"); } if (!hwa) {