virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/nvenc: check pop_context return value

Browse Source
This commit is contained in:
Timo Rothenpieler 2017-11-15 18:33:31 +01:00
parent 15b019e40a
commit 4e93f00b06
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/nvenc.c
View File

@ -1293,7 +1293,7 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx)
static av_cold int nvenc_setup_surfaces(AVCodecContext *avctx) static av_cold int nvenc_setup_surfaces(AVCodecContext *avctx)
{ {
NvencContext *ctx = avctx->priv_data; NvencContext *ctx = avctx->priv_data;
int i, res; int i, res = 0, res2;
ctx->surfaces = av_mallocz_array(ctx->nb_surfaces, sizeof(*ctx->surfaces)); ctx->surfaces = av_mallocz_array(ctx->nb_surfaces, sizeof(*ctx->surfaces));
if (!ctx->surfaces) if (!ctx->surfaces)
@ -1320,17 +1320,15 @@ static av_cold int nvenc_setup_surfaces(AVCodecContext *avctx)
for (i = 0; i < ctx->nb_surfaces; i++) { for (i = 0; i < ctx->nb_surfaces; i++) {
if ((res = nvenc_alloc_surface(avctx, i)) < 0) if ((res = nvenc_alloc_surface(avctx, i)) < 0)
{ goto fail;
nvenc_pop_context(avctx);
return res;
}
} }
res = nvenc_pop_context(avctx); fail:
if (res < 0) res2 = nvenc_pop_context(avctx);
return res; if (res2 < 0)
return res2;
return 0; return res;
} }
static av_cold int nvenc_setup_extradata(AVCodecContext *avctx) static av_cold int nvenc_setup_extradata(AVCodecContext *avctx)