diff options
| author | James Almer <jamrial@gmail.com> | 2020-05-29 15:07:41 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-06-04 09:58:27 -0300 |
| commit | 8e7b5ba80e05eb5d58b724bec0be19611b11958a (patch) | |
| tree | fa4dd68bd9150bb7eae5cedd46396c80526167c3 /libavcodec/decode.c | |
| parent | 821fda819abfede696d959b6e9416ece814e6827 (diff) | |
| download | ffmpeg-8e7b5ba80e05eb5d58b724bec0be19611b11958a.tar.gz | |
avcodec/decode: actually propagate AVHWAccel.alloc_frame() return value
Finishes fixing the regression introduced in a1133db30ef07896afd96f067e5c51531a4e85ab
after the partial fix in b6d6597bef66531ec07c07a7125b88aee38fb220.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/decode.c')
| -rw-r--r-- | libavcodec/decode.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index eed89a89a7..a4e50c0d03 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1911,10 +1911,12 @@ end: frame->height = avctx->height; } - return 0; fail: - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - av_frame_unref(frame); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + av_frame_unref(frame); + } + return ret; } |