ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Sat Jan 23 10:12:30 2016 +0100| [5edd1f62ca15ad34705789f155f68ca18914d0f4] | committer: 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 31741ae. Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Warning message text by nevcairiel Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5edd1f62ca15ad34705789f155f68ca18914d0f4 --- libavcodec/utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ee73670..53c0c22 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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
