Module: libav Branch: master Commit: d005ccc630e42daab8ec2afecf972d1551a9401a
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Sat Jan 30 22:13:04 2016 +0100 nvenc: rename a misnamed function This function copies the encoded bistream into the caller's packet, calling it 'get_frame' is misleading. --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index caf683e..0783c35 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1052,7 +1052,7 @@ static int nvenc_set_timestamp(AVCodecContext *avctx, return nvenc_dequeue_timestamp(ctx->timestamps, &pkt->dts); } -static int nvenc_get_frame(AVCodecContext *avctx, AVPacket *pkt) +static int nvenc_get_output(AVCodecContext *avctx, AVPacket *pkt) { NVENCContext *ctx = avctx->priv_data; NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs; @@ -1196,7 +1196,7 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } if (output_ready(avctx, !frame)) { - ret = nvenc_get_frame(avctx, pkt); + ret = nvenc_get_output(avctx, pkt); if (ret < 0) return ret; *got_packet = 1; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
