virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec: only warn about hwaccel with frame threads

Browse Source 
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>
This commit is contained in:
Andreas Cadhalpun 2016-01-23 10:12:30 +01:00 committed by Michael Niedermayer
parent 09b8e97ab6
commit 5edd1f62ca
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utils.c
View File

@ -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) {