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 <Andreas.Cadhalpun@googlemail.com>

Warning message text by nevcairiel

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/175/head
Andreas Cadhalpun 9 years ago committed by Michael Niedermayer
parent 09b8e97ab6
commit 5edd1f62ca
  1. 5
      libavcodec/utils.c

@ -1016,9 +1016,8 @@ static int setup_hwaccel(AVCodecContext *avctx,
int ret = 0; int ret = 0;
if (avctx->active_thread_type & FF_THREAD_FRAME) { if (avctx->active_thread_type & FF_THREAD_FRAME) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_WARNING,
"Hardware accelerated decoding with frame threading is not supported.\n"); "Hardware accelerated decoding with frame threading is known to be unstable and its use is discourage.\n");
return AVERROR(EINVAL);
} }
if (!hwa) { if (!hwa) {

Loading…
Cancel
Save