summaryrefslogtreecommitdiff
path: root/libavcodec/nvenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-01-30 22:13:04 +0100
committerAnton Khirnov <anton@khirnov.net>2016-02-12 10:20:11 +0100
commitd005ccc630e42daab8ec2afecf972d1551a9401a (patch)
treef16b4a584caff2166d0a1aac8f7a5a109956bd40 /libavcodec/nvenc.c
parent118beda355076acf03611e5c8bc147a9c634e54f (diff)
nvenc: rename a misnamed function
This function copies the encoded bistream into the caller's packet, calling it 'get_frame' is misleading.
Diffstat (limited to 'libavcodec/nvenc.c')
-rw-r--r--libavcodec/nvenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index caf683e13c..0783c355c8 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;