diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2016-01-23 10:12:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-02-14 12:53:55 +0100 |
| commit | 5edd1f62ca15ad34705789f155f68ca18914d0f4 (patch) | |
| tree | d9308618222d103569a8b5eba00ca56717c43404 /libavcodec/utils.c | |
| parent | 09b8e97ab62d4c83cf892cfdd49e2c28a9a41eba (diff) | |
| download | ffmpeg-streaming-5edd1f62ca15ad34705789f155f68ca18914d0f4.zip ffmpeg-streaming-5edd1f62ca15ad34705789f155f68ca18914d0f4.tar.gz | |
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>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files 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) { |
