RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/decode: fix decoding when frames are allocated using AVHWAccel.alloc_frame() 

Regression since a1133db30e

Found-by: comex <comexk@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-05-27 23:10:04 -03:00
parent 6d4fdb4f5a
commit b6d6597bef
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/decode.c
View File

@ -1889,7 +1889,7 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
if (hwaccel) { if (hwaccel) {
if (hwaccel->alloc_frame) { if (hwaccel->alloc_frame) {
ret = hwaccel->alloc_frame(avctx, frame); ret = hwaccel->alloc_frame(avctx, frame);
goto fail; goto end;
} }
} else } else
avctx->sw_pix_fmt = avctx->pix_fmt; avctx->sw_pix_fmt = avctx->pix_fmt;
@ -1904,6 +1904,7 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
end:
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions && if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions &&
!(avctx->codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING)) { !(avctx->codec->caps_internal & FF_CODEC_CAP_EXPORTS_CROPPING)) {
frame->width = avctx->width; frame->width = avctx->width;