diff options
| author | James Almer <jamrial@gmail.com> | 2020-05-27 23:10:04 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-05-27 23:10:04 -0300 |
| commit | b6d6597bef66531ec07c07a7125b88aee38fb220 (patch) | |
| tree | 95dba6293fcb2a3d747e47c5d96d7e40074df2ed /libavcodec | |
| parent | 6d4fdb4f5a184f6deabbda4a71d72a3bb3a9b084 (diff) | |
avcodec/decode: fix decoding when frames are allocated using AVHWAccel.alloc_frame()
Regression since a1133db30ef07896afd96f067e5c51531a4e85ab
Found-by: comex <comexk@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/decode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index e438135b53..eed89a89a7 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1889,7 +1889,7 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) if (hwaccel) { if (hwaccel->alloc_frame) { ret = hwaccel->alloc_frame(avctx, frame); - goto fail; + goto end; } } else avctx->sw_pix_fmt = avctx->pix_fmt; @@ -1904,6 +1904,7 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) if (ret < 0) goto fail; +end: if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions && !(avctx->codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING)) { frame->width = avctx->width; |