[FFmpeg-devel] [PATCH] avcodec: only warn about hwaccel with frame threads
Andreas Cadhalpun
andreas.cadhalpun at googlemail.com
Sat Jan 23 10:12:30 CET 2016
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 at googlemail.com>
---
libavcodec/utils.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 63439bb..a22d80d 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1012,9 +1012,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 might cause problems.\n");
}
if (!hwa) {
--
2.7.0.rc3
More information about the ffmpeg-devel
mailing list