generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nvenc: rename a misnamed function

Browse Source 
This function copies the encoded bistream into the caller's packet,
calling it 'get_frame' is misleading.
This commit is contained in:
Anton Khirnov 2016-01-30 22:13:04 +01:00
parent 118beda355
commit d005ccc630
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/nvenc.c
View File

@ -1052,7 +1052,7 @@ static int nvenc_set_timestamp(AVCodecContext *avctx,
return nvenc_dequeue_timestamp(ctx->timestamps, &pkt->dts); 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; NVENCContext *ctx = avctx->priv_data;
NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs; 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)) { if (output_ready(avctx, !frame)) {
ret = nvenc_get_frame(avctx, pkt); ret = nvenc_get_output(avctx, pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
*got_packet = 1; *got_packet = 1;