diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2018-05-03 18:57:40 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2018-05-04 23:35:38 +0200 |
| commit | fdbb4b9a7866919e58212d3927ca47528235d847 (patch) | |
| tree | 2fae7b8f0dadd938f5a29e147a2c3db3f236b5ce /libavcodec/nvenc.c | |
| parent | 5a88e8c36581fed09c7db6dc7229f1fd9ab5559d (diff) | |
| download | ffmpeg-fdbb4b9a7866919e58212d3927ca47528235d847.tar.gz | |
avcodec/nvenc: move reconfig_encoder call inside of push/pop ctx
Also make it void, it must not fail the encode anyway.
Diffstat (limited to 'libavcodec/nvenc.c')
| -rw-r--r-- | libavcodec/nvenc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index f3193f1cc7..d61955c03a 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1948,7 +1948,7 @@ static int output_ready(AVCodecContext *avctx, int flush) return (nb_ready > 0) && (nb_ready + nb_pending >= ctx->async_depth); } -static int reconfig_encoder(AVCodecContext *avctx, const AVFrame *frame) +static void reconfig_encoder(AVCodecContext *avctx, const AVFrame *frame) { NvencContext *ctx = avctx->priv_data; NV_ENCODE_API_FUNCTION_LIST *p_nvenc = &ctx->nvenc_dload_funcs.nvenc_funcs; @@ -2038,8 +2038,6 @@ static int reconfig_encoder(AVCodecContext *avctx, const AVFrame *frame) } } - - return 0; } int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) @@ -2064,8 +2062,6 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) return AVERROR_EOF; if (frame) { - reconfig_encoder(avctx, frame); - in_surf = get_free_frame(ctx); if (!in_surf) return AVERROR(EAGAIN); @@ -2074,6 +2070,8 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) if (res < 0) return res; + reconfig_encoder(avctx, frame); + res = nvenc_upload_frame(avctx, frame, in_surf); res2 = nvenc_pop_context(avctx); |