[FFmpeg-cvslog] avcodec/decode: actually propagate AVHWAccel.alloc_frame() return value
James Almer
git at videolan.org
Thu Jun 4 16:00:14 EEST 2020
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri May 29 15:07:41 2020 -0300| [8e7b5ba80e05eb5d58b724bec0be19611b11958a] | committer: James Almer
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e7b5ba80e05eb5d58b724bec0be19611b11958a
---
libavcodec/decode.c | 8 +++++---
1 file 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;
}
More information about the ffmpeg-cvslog
mailing list