Commit 5edd1f62 authored by Andreas Cadhalpun's avatar Andreas Cadhalpun Committed by Michael Niedermayer

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 31741aec.
Signed-off-by: 's avatarAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Warning message text by nevcairiel
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 09b8e97a
......@@ -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) {
......
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